Upgraded to AGP 3.6.3

* Had to add `android.useAndroidX` to a few tests since the AGP update
requires it when using an AndroidX library

Author: jkasten2

build.gradle

@@ -25,8 +25,8 @@ dependencies {
 
     // These are compileOnly just so we can inspect these classes in IntelliJ
     // Android Gradle Plugin (AGP)
-    compileOnly 'com.android.tools.build:gradle:3.5.3'
-    testCompileOnly 'com.android.tools.build:gradle:3.5.3'
+    compileOnly 'com.android.tools.build:gradle:3.6.3'
+    testCompileOnly 'com.android.tools.build:gradle:3.6.3'
 
     // Google Play Services Gradle Plugin
     compileOnly 'com.google.gms:google-services:4.3.+'

gradle/dependency-locks/compileClasspath.lockfile

@@ -1,60 +1,63 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:3.5.3
-androidx.databinding:databinding-compiler-common:3.5.3
-com.android.databinding:baseLibrary:3.5.3
-com.android.tools.analytics-library:crash:26.5.3
-com.android.tools.analytics-library:protos:26.5.3
-com.android.tools.analytics-library:shared:26.5.3
-com.android.tools.analytics-library:tracker:26.5.3
-com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
-com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04
+androidx.databinding:databinding-common:3.6.3
+androidx.databinding:databinding-compiler-common:3.6.3
+com.android.databinding:baseLibrary:3.6.3
+com.android.tools.analytics-library:crash:26.6.3
+com.android.tools.analytics-library:protos:26.6.3
+com.android.tools.analytics-library:shared:26.6.3
+com.android.tools.analytics-library:tracker:26.6.3
+com.android.tools.build.jetifier:jetifier-core:1.0.0-beta08
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta08
 com.android.tools.build:aapt2-proto:0.4.0
-com.android.tools.build:apksig:3.5.3
-com.android.tools.build:apkzlib:3.5.3
-com.android.tools.build:builder-model:3.5.3
-com.android.tools.build:builder-test-api:3.5.3
-com.android.tools.build:builder:3.5.3
-com.android.tools.build:bundletool:0.9.0
-com.android.tools.build:gradle-api:3.5.3
-com.android.tools.build:gradle:3.5.3
-com.android.tools.build:manifest-merger:26.5.3
+com.android.tools.build:apksig:3.6.3
+com.android.tools.build:apkzlib:3.6.3
+com.android.tools.build:builder-model:3.6.3
+com.android.tools.build:builder-test-api:3.6.3
+com.android.tools.build:builder:3.6.3
+com.android.tools.build:bundletool:0.10.3
+com.android.tools.build:gradle-api:3.6.3
+com.android.tools.build:gradle:3.6.3
+com.android.tools.build:manifest-merger:26.6.3
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
-com.android.tools.ddms:ddmlib:26.5.3
-com.android.tools.layoutlib:layoutlib-api:26.5.3
-com.android.tools.lint:lint-gradle-api:26.5.3
-com.android.tools:annotations:26.5.3
-com.android.tools:common:26.5.3
-com.android.tools:dvlib:26.5.3
-com.android.tools:repository:26.5.3
-com.android.tools:sdk-common:26.5.3
-com.android.tools:sdklib:26.5.3
+com.android.tools.ddms:ddmlib:26.6.3
+com.android.tools.layoutlib:layoutlib-api:26.6.3
+com.android.tools.lint:lint-gradle-api:26.6.3
+com.android.tools:annotations:26.6.3
+com.android.tools:common:26.6.3
+com.android.tools:dvlib:26.6.3
+com.android.tools:repository:26.6.3
+com.android.tools:sdk-common:26.6.3
+com.android.tools:sdklib:26.6.3
+com.android:signflinger:3.6.3
+com.android:zipflinger:3.6.3
 com.google.android.gms:strict-version-matcher-plugin:1.2.1
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.5
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.gms:google-services:4.3.3
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.jimfs:jimfs:1.1
 com.google.protobuf:protobuf-java-util:3.4.0
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
-com.squareup:javapoet:1.8.0
+com.squareup:javapoet:1.10.0
 com.squareup:javawriter:2.5.0
 com.sun.activation:javax.activation:1.2.0
-com.sun.istack:istack-commons-runtime:2.21
-com.sun.xml.fastinfoset:FastInfoset:1.2.13
+com.sun.istack:istack-commons-runtime:3.0.7
+com.sun.xml.fastinfoset:FastInfoset:1.2.15
 commons-codec:commons-codec:1.10
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.2
 it.unimi.dsi:fastutil:7.2.0
+javax.activation:javax.activation-api:1.2.0
 javax.inject:javax.inject:1
-javax.xml.bind:jaxb-api:2.2.12-b140109.1041
+javax.xml.bind:jaxb-api:2.3.1
 net.sf.jopt-simple:jopt-simple:4.9
 net.sf.kxml:kxml2:2.3.0
 net.sf.proguard:proguard-base:6.0.3
@@ -68,20 +71,19 @@ org.bouncycastle:bcpkix-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.56
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
-org.glassfish.jaxb:jaxb-core:2.2.11
-org.glassfish.jaxb:jaxb-runtime:2.2.11
-org.glassfish.jaxb:txw2:2.2.11
+org.glassfish.jaxb:jaxb-runtime:2.3.1
+org.glassfish.jaxb:txw2:2.3.1
 org.jdom:jdom2:2.0.6
-org.jetbrains.kotlin:kotlin-reflect:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib:1.3.50
+org.jetbrains.kotlin:kotlin-reflect:1.3.71
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.71
+org.jetbrains.kotlin:kotlin-stdlib:1.3.71
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
-org.jvnet.staxex:stax-ex:1.7.7
-org.ow2.asm:asm-analysis:6.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:6.0
-org.ow2.asm:asm-util:6.0
-org.ow2.asm:asm:6.0
+org.jvnet.staxex:stax-ex:1.8
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0

gradle/dependency-locks/testCompileClasspath.lockfile

@@ -1,60 +1,63 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:3.5.3
-androidx.databinding:databinding-compiler-common:3.5.3
-com.android.databinding:baseLibrary:3.5.3
-com.android.tools.analytics-library:crash:26.5.3
-com.android.tools.analytics-library:protos:26.5.3
-com.android.tools.analytics-library:shared:26.5.3
-com.android.tools.analytics-library:tracker:26.5.3
-com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
-com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04
+androidx.databinding:databinding-common:3.6.3
+androidx.databinding:databinding-compiler-common:3.6.3
+com.android.databinding:baseLibrary:3.6.3
+com.android.tools.analytics-library:crash:26.6.3
+com.android.tools.analytics-library:protos:26.6.3
+com.android.tools.analytics-library:shared:26.6.3
+com.android.tools.analytics-library:tracker:26.6.3
+com.android.tools.build.jetifier:jetifier-core:1.0.0-beta08
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta08
 com.android.tools.build:aapt2-proto:0.4.0
-com.android.tools.build:apksig:3.5.3
-com.android.tools.build:apkzlib:3.5.3
-com.android.tools.build:builder-model:3.5.3
-com.android.tools.build:builder-test-api:3.5.3
-com.android.tools.build:builder:3.5.3
-com.android.tools.build:bundletool:0.9.0
-com.android.tools.build:gradle-api:3.5.3
-com.android.tools.build:gradle:3.5.3
-com.android.tools.build:manifest-merger:26.5.3
+com.android.tools.build:apksig:3.6.3
+com.android.tools.build:apkzlib:3.6.3
+com.android.tools.build:builder-model:3.6.3
+com.android.tools.build:builder-test-api:3.6.3
+com.android.tools.build:builder:3.6.3
+com.android.tools.build:bundletool:0.10.3
+com.android.tools.build:gradle-api:3.6.3
+com.android.tools.build:gradle:3.6.3
+com.android.tools.build:manifest-merger:26.6.3
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
-com.android.tools.ddms:ddmlib:26.5.3
-com.android.tools.layoutlib:layoutlib-api:26.5.3
-com.android.tools.lint:lint-gradle-api:26.5.3
-com.android.tools:annotations:26.5.3
-com.android.tools:common:26.5.3
-com.android.tools:dvlib:26.5.3
-com.android.tools:repository:26.5.3
-com.android.tools:sdk-common:26.5.3
-com.android.tools:sdklib:26.5.3
+com.android.tools.ddms:ddmlib:26.6.3
+com.android.tools.layoutlib:layoutlib-api:26.6.3
+com.android.tools.lint:lint-gradle-api:26.6.3
+com.android.tools:annotations:26.6.3
+com.android.tools:common:26.6.3
+com.android.tools:dvlib:26.6.3
+com.android.tools:repository:26.6.3
+com.android.tools:sdk-common:26.6.3
+com.android.tools:sdklib:26.6.3
+com.android:signflinger:3.6.3
+com.android:zipflinger:3.6.3
 com.google.android.gms:strict-version-matcher-plugin:1.2.1
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.5
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.gms:google-services:4.3.3
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.jimfs:jimfs:1.1
 com.google.protobuf:protobuf-java-util:3.4.0
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
-com.squareup:javapoet:1.8.0
+com.squareup:javapoet:1.10.0
 com.squareup:javawriter:2.5.0
 com.sun.activation:javax.activation:1.2.0
-com.sun.istack:istack-commons-runtime:2.21
-com.sun.xml.fastinfoset:FastInfoset:1.2.13
+com.sun.istack:istack-commons-runtime:3.0.7
+com.sun.xml.fastinfoset:FastInfoset:1.2.15
 commons-codec:commons-codec:1.10
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.2
 it.unimi.dsi:fastutil:7.2.0
+javax.activation:javax.activation-api:1.2.0
 javax.inject:javax.inject:1
-javax.xml.bind:jaxb-api:2.2.12-b140109.1041
+javax.xml.bind:jaxb-api:2.3.1
 junit:junit:4.12
 net.sf.jopt-simple:jopt-simple:4.9
 net.sf.kxml:kxml2:2.3.0
@@ -69,22 +72,21 @@ org.bouncycastle:bcpkix-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.56
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
-org.glassfish.jaxb:jaxb-core:2.2.11
-org.glassfish.jaxb:jaxb-runtime:2.2.11
-org.glassfish.jaxb:txw2:2.2.11
+org.glassfish.jaxb:jaxb-runtime:2.3.1
+org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:1.3
 org.jdom:jdom2:2.0.6
-org.jetbrains.kotlin:kotlin-reflect:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib:1.3.50
+org.jetbrains.kotlin:kotlin-reflect:1.3.71
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.71
+org.jetbrains.kotlin:kotlin-stdlib:1.3.71
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
-org.jvnet.staxex:stax-ex:1.7.7
-org.ow2.asm:asm-analysis:6.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:6.0
-org.ow2.asm:asm-util:6.0
-org.ow2.asm:asm:6.0
+org.jvnet.staxex:stax-ex:1.8
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
 org.spockframework:spock-core:1.0-groovy-2.4

src/test/groovy/com/onesignal/androidsdk/GradleTestTemplate.groovy

@@ -27,7 +27,7 @@ class GradleTestTemplate {
     static void setup() {
         gradleVersions = [
             (GRADLE_OLDEST_VERSION): 'com.android.tools.build:gradle:2.2.3',
-            (GRADLE_LATEST_VERSION): 'com.android.tools.build:gradle:3.5.3'
+            (GRADLE_LATEST_VERSION): 'com.android.tools.build:gradle:3.6.3'
         ]
 
         buildArgumentSets = [

src/test/groovy/com/onesignal/androidsdk/MainTest.groovy

@@ -300,7 +300,6 @@ class MainTest extends Specification {
         when:
         def results = runGradleProject([
             'android.useAndroidX': true,
-            'android.enableJetifier': true,
             compileLines : """\
                 implementation 'com.onesignal:OneSignal:3.0.0'
                 implementation 'com.google.firebase:firebase-iid:20.1.1'
@@ -318,13 +317,12 @@ class MainTest extends Specification {
     def "Upgrade to compatible OneSignal SDK when firebase-iid:20.1.6 is used"() {
         when:
         def results = runGradleProject([
-                'android.useAndroidX': true,
-                'android.enableJetifier': true,
-                compileLines : """\
+            'android.useAndroidX': true,
+            compileLines : """\
                 implementation 'com.onesignal:OneSignal:3.0.0'
                 implementation 'com.google.firebase:firebase-iid:20.1.6'
             """,
-                skipGradleVersion: GRADLE_OLDEST_VERSION
+            skipGradleVersion: GRADLE_OLDEST_VERSION
         ])
 
         then:
@@ -936,6 +934,7 @@ class MainTest extends Specification {
 
         when:
         def results = runGradleProject([
+            'android.useAndroidX': true,
             skipGradleVersion: GRADLE_OLDEST_VERSION,
             compileLines : compileLines
         ])
@@ -993,8 +992,9 @@ class MainTest extends Specification {
 
         when:
         def results = runGradleProject([
+            'android.useAndroidX': true,
             skipGradleVersion: GRADLE_OLDEST_VERSION,
-            compileLines : compileLines
+            compileLines: compileLines
         ])
 
         then:
@@ -1108,6 +1108,7 @@ class MainTest extends Specification {
 
         when:
         def results = runGradleProject([
+            'android.useAndroidX': true,
             compileLines : compileLines,
             skipGradleVersion: GRADLE_OLDEST_VERSION
         ])
@@ -1203,6 +1204,7 @@ class MainTest extends Specification {
         when:
         // Keep as '+' for latest when checking in to this fails when Google changes requirements
         def results = runGradleProject([
+            'android.useAndroidX': true,
             compileLines: """
                 compile 'com.google.android.gms:play-services-ads:+'
                 compile 'com.google.android.gms:play-services-base:+'