diff --git a/CHANGES.md b/CHANGES.md index 99a0f8827..5f4922810 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -### 4.0.0 (2019-09-07) +### 4.0.2 (2019-09-07) * Use androidx. * Use zxing:core 3.4.0 by default. @@ -6,6 +6,10 @@ * Fix ArithmeticException. * Fix ResultPoint locations when camera is mirrored. +### 4.0.0 / 4.0.1 (2019-09-07) + +* Broken release - use 4.0.2. + ### 3.6.0 (2018-03-04) * Use zxing:core 3.3.2 by default (#360). diff --git a/build.gradle b/build.gradle index 4c3bd0ac8..984de0032 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.5.0' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' } } @@ -17,7 +17,7 @@ subprojects { mavenLocal() } - version = '4.0.0' + version = '4.0.2' group = 'com.journeyapps' ext.androidBuildTools = '28.0.3' diff --git a/sample/build.gradle b/sample/build.gradle index 85e7dbcb7..5be3a4c7a 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 24 targetSdkVersion project.androidTargetSdk - versionCode 400 - versionName "4.0.0" + versionCode 402 + versionName "4.0.2" } def validConfig @@ -60,7 +60,7 @@ android { dependencies { // If you use this from an external project, use the following instead: - // compile 'com.journeyapps:zxing-android-embedded:' + // implementation 'com.journeyapps:zxing-android-embedded:' implementation project(':zxing-android-embedded') implementation 'androidx.appcompat:appcompat:1.0.2' diff --git a/zxing-android-embedded/build.gradle b/zxing-android-embedded/build.gradle index 0c17e3f81..345da5487 100644 --- a/zxing-android-embedded/build.gradle +++ b/zxing-android-embedded/build.gradle @@ -65,12 +65,11 @@ task sourceJar(type: Jar) { from android.sourceSets.main.java.srcDirs } -publishing { - publications { - // We need this check to cover Android Studio gradle sync - if(project.tasks.findByPath('bundleRelease') != null) { +project.afterEvaluate { + publishing { + publications { maven(MavenPublication) { - artifact bundleRelease + artifact bundleReleaseAar artifactId project.artifactId artifact sourceJar @@ -81,16 +80,15 @@ publishing { // remove this section. def deps = asNode().appendNode('dependencies') - project.configurations.compile.allDependencies.each { dep -> + project.configurations.api.allDependencies.each { dep -> def node = deps.appendNode('dependency') node.appendNode('groupId', dep.group) node.appendNode('artifactId', dep.name) node.appendNode('version', dep.version) - node.appendNode('scope', 'compile') + node.appendNode('scope', 'api') } } - } } }