Merge branch 'master' of github.com:OneSignal/OneSignal-Gradle-Plugin

Author: jkasten2

README.md

@@ -40,7 +40,7 @@ Applies to the following libraries:
 ## Compatibility
 * Recommend using AGP 3.0.0 or newer ([Android Gradle Plugin](https://developer.android.com/studio/releases/gradle-plugin)) and Gradle 4.1 or newer.
 * Compatible with Gradle 2.14.1+ and AGP 2.2.3+
-* Tested up to Gradle 4.9 and AGP 3.1.4
+* Tested up to Gradle 4.10.2 and AGP 3.2.1
 
 ## Change Log
 See this repository's [release tags](https://github.com/OneSignal/OneSignal-Gradle-Plugin/releases) for a complete change log.

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.1.+'
-    testCompileOnly 'com.android.tools.build:gradle:3.1.+'
+    compileOnly 'com.android.tools.build:gradle:3.2.+'
+    testCompileOnly 'com.android.tools.build:gradle:3.2.+'
 
     // Google Play Services Gradle Plugin
     compileOnly 'com.google.gms:google-services:4.0.+'

gradle/dependency-locks/compileClasspath.lockfile

@@ -1,38 +1,42 @@
 # 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.
-com.android.databinding:baseLibrary:3.1.4
-com.android.databinding:compilerCommon:3.1.4
-com.android.tools.analytics-library:protos:26.1.4
-com.android.tools.analytics-library:shared:26.1.4
-com.android.tools.analytics-library:tracker:26.1.4
-com.android.tools.build:aapt2-proto:0.1.0
-com.android.tools.build:apksig:3.1.4
-com.android.tools.build:builder-model:3.1.4
-com.android.tools.build:builder-test-api:3.1.4
-com.android.tools.build:builder:3.1.4
-com.android.tools.build:bundletool:0.1.0-alpha01
-com.android.tools.build:gradle-api:3.1.4
-com.android.tools.build:gradle-core:3.1.4
-com.android.tools.build:gradle:3.1.4
-com.android.tools.build:manifest-merger:26.1.4
+androidx.databinding:databinding-common:3.2.1
+androidx.databinding:databinding-compiler-common:3.2.1
+com.android.databinding:baseLibrary:3.2.1
+com.android.tools.analytics-library:crash:26.2.1
+com.android.tools.analytics-library:protos:26.2.1
+com.android.tools.analytics-library:shared:26.2.1
+com.android.tools.analytics-library:tracker:26.2.1
+com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
+com.android.tools.build:aapt2-proto:0.3.1
+com.android.tools.build:apksig:3.2.1
+com.android.tools.build:apkzlib:3.2.1
+com.android.tools.build:builder-model:3.2.1
+com.android.tools.build:builder-test-api:3.2.1
+com.android.tools.build:builder:3.2.1
+com.android.tools.build:bundletool:0.5.0
+com.android.tools.build:gradle-api:3.2.1
+com.android.tools.build:gradle:3.2.1
+com.android.tools.build:manifest-merger:26.2.1
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
-com.android.tools.ddms:ddmlib:26.1.4
-com.android.tools.layoutlib:layoutlib-api:26.1.4
-com.android.tools.lint:lint-gradle-api:26.1.4
-com.android.tools:annotations:26.1.4
-com.android.tools:common:26.1.4
-com.android.tools:dvlib:26.1.4
-com.android.tools:repository:26.1.4
-com.android.tools:sdk-common:26.1.4
-com.android.tools:sdklib:26.1.4
+com.android.tools.ddms:ddmlib:26.2.1
+com.android.tools.layoutlib:layoutlib-api:26.2.1
+com.android.tools.lint:lint-gradle-api:26.2.1
+com.android.tools:annotations:26.2.1
+com.android.tools:common:26.2.1
+com.android.tools:dvlib:26.2.1
+com.android.tools:repository:26.2.1
+com.android.tools:sdk-common:26.2.1
+com.android.tools:sdklib:26.2.1
 com.google.android.gms:strict-version-matcher-plugin:1.0.3
 com.google.auto.value:auto-value:1.5.2
 com.google.code.findbugs:jsr305:1.3.9
-com.google.code.gson:gson:2.7
-com.google.errorprone:error_prone_annotations:2.1.2
+com.google.code.gson:gson:2.8.0
+com.google.errorprone:error_prone_annotations:2.2.0
 com.google.gms:google-services:4.0.2
-com.google.guava:guava:22.0
+com.google.guava:guava:23.0
 com.google.j2objc:j2objc-annotations:1.1
 com.google.jimfs:jimfs:1.1
 com.google.protobuf:protobuf-java-util:3.4.0
@@ -44,34 +48,37 @@ 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
-commons-codec:commons-codec:1.6
+commons-codec:commons-codec:1.9
 commons-io:commons-io:2.4
-commons-logging:commons-logging:1.1.1
+commons-logging:commons-logging:1.2
 it.unimi.dsi:fastutil:7.2.0
+javax.inject:javax.inject:1
 javax.xml.bind:jaxb-api:2.2.12-b140109.1041
 net.sf.jopt-simple:jopt-simple:4.9
 net.sf.kxml:kxml2:2.3.0
-net.sf.proguard:proguard-base:5.3.3
-net.sf.proguard:proguard-gradle:5.3.3
+net.sf.proguard:proguard-base:6.0.3
+net.sf.proguard:proguard-gradle:6.0.3
 org.antlr:antlr4:4.5.3
 org.apache.commons:commons-compress:1.12
-org.apache.httpcomponents:httpclient:4.2.6
-org.apache.httpcomponents:httpcore:4.2.5
-org.apache.httpcomponents:httpmime:4.1
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.5
+org.apache.httpcomponents:httpmime:4.5.2
 org.bouncycastle:bcpkix-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.56
 org.codehaus.mojo:animal-sniffer-annotations:1.14
 org.glassfish.jaxb:jaxb-core:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.2.11
 org.glassfish.jaxb:txw2:2.2.11
+org.jdom:jdom2:2.0.6
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib:1.2.0
+org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains:annotations:13.0
 org.jvnet.staxex:stax-ex:1.7.7
-org.ow2.asm:asm-analysis:5.1
-org.ow2.asm:asm-commons:5.1
-org.ow2.asm:asm-tree:5.1
-org.ow2.asm:asm-util:5.1
-org.ow2.asm:asm:5.1
+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

gradle/dependency-locks/compileOnly.lockfile

@@ -1,38 +1,42 @@
 # 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.
-com.android.databinding:baseLibrary:3.1.4
-com.android.databinding:compilerCommon:3.1.4
-com.android.tools.analytics-library:protos:26.1.4
-com.android.tools.analytics-library:shared:26.1.4
-com.android.tools.analytics-library:tracker:26.1.4
-com.android.tools.build:aapt2-proto:0.1.0
-com.android.tools.build:apksig:3.1.4
-com.android.tools.build:builder-model:3.1.4
-com.android.tools.build:builder-test-api:3.1.4
-com.android.tools.build:builder:3.1.4
-com.android.tools.build:bundletool:0.1.0-alpha01
-com.android.tools.build:gradle-api:3.1.4
-com.android.tools.build:gradle-core:3.1.4
-com.android.tools.build:gradle:3.1.4
-com.android.tools.build:manifest-merger:26.1.4
+androidx.databinding:databinding-common:3.2.1
+androidx.databinding:databinding-compiler-common:3.2.1
+com.android.databinding:baseLibrary:3.2.1
+com.android.tools.analytics-library:crash:26.2.1
+com.android.tools.analytics-library:protos:26.2.1
+com.android.tools.analytics-library:shared:26.2.1
+com.android.tools.analytics-library:tracker:26.2.1
+com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
+com.android.tools.build:aapt2-proto:0.3.1
+com.android.tools.build:apksig:3.2.1
+com.android.tools.build:apkzlib:3.2.1
+com.android.tools.build:builder-model:3.2.1
+com.android.tools.build:builder-test-api:3.2.1
+com.android.tools.build:builder:3.2.1
+com.android.tools.build:bundletool:0.5.0
+com.android.tools.build:gradle-api:3.2.1
+com.android.tools.build:gradle:3.2.1
+com.android.tools.build:manifest-merger:26.2.1
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
-com.android.tools.ddms:ddmlib:26.1.4
-com.android.tools.layoutlib:layoutlib-api:26.1.4
-com.android.tools.lint:lint-gradle-api:26.1.4
-com.android.tools:annotations:26.1.4
-com.android.tools:common:26.1.4
-com.android.tools:dvlib:26.1.4
-com.android.tools:repository:26.1.4
-com.android.tools:sdk-common:26.1.4
-com.android.tools:sdklib:26.1.4
+com.android.tools.ddms:ddmlib:26.2.1
+com.android.tools.layoutlib:layoutlib-api:26.2.1
+com.android.tools.lint:lint-gradle-api:26.2.1
+com.android.tools:annotations:26.2.1
+com.android.tools:common:26.2.1
+com.android.tools:dvlib:26.2.1
+com.android.tools:repository:26.2.1
+com.android.tools:sdk-common:26.2.1
+com.android.tools:sdklib:26.2.1
 com.google.android.gms:strict-version-matcher-plugin:1.0.3
 com.google.auto.value:auto-value:1.5.2
 com.google.code.findbugs:jsr305:1.3.9
-com.google.code.gson:gson:2.7
-com.google.errorprone:error_prone_annotations:2.1.2
+com.google.code.gson:gson:2.8.0
+com.google.errorprone:error_prone_annotations:2.2.0
 com.google.gms:google-services:4.0.2
-com.google.guava:guava:22.0
+com.google.guava:guava:23.0
 com.google.j2objc:j2objc-annotations:1.1
 com.google.jimfs:jimfs:1.1
 com.google.protobuf:protobuf-java-util:3.4.0
@@ -44,34 +48,37 @@ 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
-commons-codec:commons-codec:1.6
+commons-codec:commons-codec:1.9
 commons-io:commons-io:2.4
-commons-logging:commons-logging:1.1.1
+commons-logging:commons-logging:1.2
 it.unimi.dsi:fastutil:7.2.0
+javax.inject:javax.inject:1
 javax.xml.bind:jaxb-api:2.2.12-b140109.1041
 net.sf.jopt-simple:jopt-simple:4.9
 net.sf.kxml:kxml2:2.3.0
-net.sf.proguard:proguard-base:5.3.3
-net.sf.proguard:proguard-gradle:5.3.3
+net.sf.proguard:proguard-base:6.0.3
+net.sf.proguard:proguard-gradle:6.0.3
 org.antlr:antlr4:4.5.3
 org.apache.commons:commons-compress:1.12
-org.apache.httpcomponents:httpclient:4.2.6
-org.apache.httpcomponents:httpcore:4.2.5
-org.apache.httpcomponents:httpmime:4.1
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.5
+org.apache.httpcomponents:httpmime:4.5.2
 org.bouncycastle:bcpkix-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.56
 org.codehaus.mojo:animal-sniffer-annotations:1.14
 org.glassfish.jaxb:jaxb-core:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.2.11
 org.glassfish.jaxb:txw2:2.2.11
+org.jdom:jdom2:2.0.6
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib:1.2.0
+org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains:annotations:13.0
 org.jvnet.staxex:stax-ex:1.7.7
-org.ow2.asm:asm-analysis:5.1
-org.ow2.asm:asm-commons:5.1
-org.ow2.asm:asm-tree:5.1
-org.ow2.asm:asm-util:5.1
-org.ow2.asm:asm:5.1
+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

gradle/dependency-locks/testCompileClasspath.lockfile

@@ -1,38 +1,42 @@
 # 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.
-com.android.databinding:baseLibrary:3.1.4
-com.android.databinding:compilerCommon:3.1.4
-com.android.tools.analytics-library:protos:26.1.4
-com.android.tools.analytics-library:shared:26.1.4
-com.android.tools.analytics-library:tracker:26.1.4
-com.android.tools.build:aapt2-proto:0.1.0
-com.android.tools.build:apksig:3.1.4
-com.android.tools.build:builder-model:3.1.4
-com.android.tools.build:builder-test-api:3.1.4
-com.android.tools.build:builder:3.1.4
-com.android.tools.build:bundletool:0.1.0-alpha01
-com.android.tools.build:gradle-api:3.1.4
-com.android.tools.build:gradle-core:3.1.4
-com.android.tools.build:gradle:3.1.4
-com.android.tools.build:manifest-merger:26.1.4
+androidx.databinding:databinding-common:3.2.1
+androidx.databinding:databinding-compiler-common:3.2.1
+com.android.databinding:baseLibrary:3.2.1
+com.android.tools.analytics-library:crash:26.2.1
+com.android.tools.analytics-library:protos:26.2.1
+com.android.tools.analytics-library:shared:26.2.1
+com.android.tools.analytics-library:tracker:26.2.1
+com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
+com.android.tools.build:aapt2-proto:0.3.1
+com.android.tools.build:apksig:3.2.1
+com.android.tools.build:apkzlib:3.2.1
+com.android.tools.build:builder-model:3.2.1
+com.android.tools.build:builder-test-api:3.2.1
+com.android.tools.build:builder:3.2.1
+com.android.tools.build:bundletool:0.5.0
+com.android.tools.build:gradle-api:3.2.1
+com.android.tools.build:gradle:3.2.1
+com.android.tools.build:manifest-merger:26.2.1
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
-com.android.tools.ddms:ddmlib:26.1.4
-com.android.tools.layoutlib:layoutlib-api:26.1.4
-com.android.tools.lint:lint-gradle-api:26.1.4
-com.android.tools:annotations:26.1.4
-com.android.tools:common:26.1.4
-com.android.tools:dvlib:26.1.4
-com.android.tools:repository:26.1.4
-com.android.tools:sdk-common:26.1.4
-com.android.tools:sdklib:26.1.4
+com.android.tools.ddms:ddmlib:26.2.1
+com.android.tools.layoutlib:layoutlib-api:26.2.1
+com.android.tools.lint:lint-gradle-api:26.2.1
+com.android.tools:annotations:26.2.1
+com.android.tools:common:26.2.1
+com.android.tools:dvlib:26.2.1
+com.android.tools:repository:26.2.1
+com.android.tools:sdk-common:26.2.1
+com.android.tools:sdklib:26.2.1
 com.google.android.gms:strict-version-matcher-plugin:1.0.3
 com.google.auto.value:auto-value:1.5.2
 com.google.code.findbugs:jsr305:1.3.9
-com.google.code.gson:gson:2.7
-com.google.errorprone:error_prone_annotations:2.1.2
+com.google.code.gson:gson:2.8.0
+com.google.errorprone:error_prone_annotations:2.2.0
 com.google.gms:google-services:4.0.2
-com.google.guava:guava:22.0
+com.google.guava:guava:23.0
 com.google.j2objc:j2objc-annotations:1.1
 com.google.jimfs:jimfs:1.1
 com.google.protobuf:protobuf-java-util:3.4.0
@@ -44,37 +48,40 @@ 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
-commons-codec:commons-codec:1.6
+commons-codec:commons-codec:1.9
 commons-io:commons-io:2.4
-commons-logging:commons-logging:1.1.1
+commons-logging:commons-logging:1.2
 it.unimi.dsi:fastutil:7.2.0
+javax.inject:javax.inject:1
 javax.xml.bind:jaxb-api:2.2.12-b140109.1041
 junit:junit:4.12
 net.sf.jopt-simple:jopt-simple:4.9
 net.sf.kxml:kxml2:2.3.0
-net.sf.proguard:proguard-base:5.3.3
-net.sf.proguard:proguard-gradle:5.3.3
+net.sf.proguard:proguard-base:6.0.3
+net.sf.proguard:proguard-gradle:6.0.3
 org.antlr:antlr4:4.5.3
 org.apache.commons:commons-compress:1.12
-org.apache.httpcomponents:httpclient:4.2.6
-org.apache.httpcomponents:httpcore:4.2.5
-org.apache.httpcomponents:httpmime:4.1
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.5
+org.apache.httpcomponents:httpmime:4.5.2
 org.bouncycastle:bcpkix-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.56
 org.codehaus.mojo:animal-sniffer-annotations:1.14
 org.glassfish.jaxb:jaxb-core:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.2.11
 org.glassfish.jaxb:txw2:2.2.11
 org.hamcrest:hamcrest-core:1.3
+org.jdom:jdom2:2.0.6
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib:1.2.0
+org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains:annotations:13.0
 org.jvnet.staxex:stax-ex:1.7.7
-org.ow2.asm:asm-analysis:5.1
-org.ow2.asm:asm-commons:5.1
-org.ow2.asm:asm-tree:5.1
-org.ow2.asm:asm-util:5.1
-org.ow2.asm:asm:5.1
+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.spockframework:spock-core:1.0-groovy-2.4