Merge pull request #495 from journeyapps/release-401

Release v4.0.2

Author: rkistner

CHANGES.md

@@ -1,11 +1,15 @@
-### 4.0.0 (2019-09-07)
+### 4.0.2 (2019-09-07)
 
 * Use androidx.
 * Use zxing:core 3.4.0 by default.
 * Minimum SDK version 24.
 * 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).

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'

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:<version>'
+    //   implementation 'com.journeyapps:zxing-android-embedded:<version>'
     implementation project(':zxing-android-embedded')
 
     implementation 'androidx.appcompat:appcompat:1.0.2'

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')
                     }
 
                 }
-
             }
         }
     }