Skip to content
This repository has been archived by the owner on Oct 31, 2022. It is now read-only.

Commit

Permalink
Updated to Android Gradle Plugin 4.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkasten2
jkasten2 committed Dec 7, 2020
1 parent 9b476c2 commit 4c447bb
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 32 deletions.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:4.0.2'
testCompileOnly 'com.android.tools.build:gradle:4.0.2'
compileOnly 'com.android.tools.build:gradle:4.1.1'
testCompileOnly 'com.android.tools.build:gradle:4.1.1'

// Google Play Services Gradle Plugin
compileOnly 'com.google.gms:google-services:4.3.+'
Expand Down
60 changes: 31 additions & 29 deletions gradle.lockfile
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
# 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:4.0.2=compileClasspath,testCompileClasspath
androidx.databinding:databinding-compiler-common:4.0.2=compileClasspath,testCompileClasspath
com.android.databinding:baseLibrary:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.analytics-library:crash:27.0.2=compileClasspath,testCompileClasspath
com.android.tools.analytics-library:protos:27.0.2=compileClasspath,testCompileClasspath
com.android.tools.analytics-library:shared:27.0.2=compileClasspath,testCompileClasspath
com.android.tools.analytics-library:tracker:27.0.2=compileClasspath,testCompileClasspath
androidx.databinding:databinding-common:4.1.1=compileClasspath,testCompileClasspath
androidx.databinding:databinding-compiler-common:4.1.1=compileClasspath,testCompileClasspath
com.android.databinding:baseLibrary:4.1.1=compileClasspath,testCompileClasspath
com.android.tools.analytics-library:crash:27.1.1=compileClasspath,testCompileClasspath
com.android.tools.analytics-library:protos:27.1.1=compileClasspath,testCompileClasspath
com.android.tools.analytics-library:shared:27.1.1=compileClasspath,testCompileClasspath
com.android.tools.analytics-library:tracker:27.1.1=compileClasspath,testCompileClasspath
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=compileClasspath,testCompileClasspath
com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=compileClasspath,testCompileClasspath
com.android.tools.build:aapt2-proto:4.0.2-6197926=compileClasspath,testCompileClasspath
com.android.tools.build:aaptcompiler:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.build:apksig:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.build:apkzlib:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.build:builder-model:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.build:builder-test-api:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.build:builder:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.build:bundletool:0.13.2=compileClasspath,testCompileClasspath
com.android.tools.build:gradle-api:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.build:gradle:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.build:manifest-merger:27.0.2=compileClasspath,testCompileClasspath
com.android.tools.build:aapt2-proto:4.1.1-6503028=compileClasspath,testCompileClasspath
com.android.tools.build:aaptcompiler:4.1.1=compileClasspath,testCompileClasspath
com.android.tools.build:apksig:4.1.1=compileClasspath,testCompileClasspath
com.android.tools.build:apkzlib:4.1.1=compileClasspath,testCompileClasspath
com.android.tools.build:builder-model:4.1.1=compileClasspath,testCompileClasspath
com.android.tools.build:builder-test-api:4.1.1=compileClasspath,testCompileClasspath
com.android.tools.build:builder:4.1.1=compileClasspath,testCompileClasspath
com.android.tools.build:bundletool:0.14.0=compileClasspath,testCompileClasspath
com.android.tools.build:gradle-api:4.1.1=compileClasspath,testCompileClasspath
com.android.tools.build:gradle:4.1.1=compileClasspath,testCompileClasspath
com.android.tools.build:manifest-merger:27.1.1=compileClasspath,testCompileClasspath
com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=compileClasspath,testCompileClasspath
com.android.tools.ddms:ddmlib:27.0.2=compileClasspath,testCompileClasspath
com.android.tools.layoutlib:layoutlib-api:27.0.2=compileClasspath,testCompileClasspath
com.android.tools.lint:lint-gradle-api:27.0.2=compileClasspath,testCompileClasspath
com.android.tools:annotations:27.0.2=compileClasspath,testCompileClasspath
com.android.tools:common:27.0.2=compileClasspath,testCompileClasspath
com.android.tools:dvlib:27.0.2=compileClasspath,testCompileClasspath
com.android.tools:repository:27.0.2=compileClasspath,testCompileClasspath
com.android.tools:sdk-common:27.0.2=compileClasspath,testCompileClasspath
com.android.tools:sdklib:27.0.2=compileClasspath,testCompileClasspath
com.android:signflinger:4.0.2=compileClasspath,testCompileClasspath
com.android:zipflinger:4.0.2=compileClasspath,testCompileClasspath
com.android.tools.ddms:ddmlib:27.1.1=compileClasspath,testCompileClasspath
com.android.tools.layoutlib:layoutlib-api:27.1.1=compileClasspath,testCompileClasspath
com.android.tools.lint:lint-gradle-api:27.1.1=compileClasspath,testCompileClasspath
com.android.tools.lint:lint-model:27.1.1=compileClasspath,testCompileClasspath
com.android.tools:annotations:27.1.1=compileClasspath,testCompileClasspath
com.android.tools:common:27.1.1=compileClasspath,testCompileClasspath
com.android.tools:dvlib:27.1.1=compileClasspath,testCompileClasspath
com.android.tools:repository:27.1.1=compileClasspath,testCompileClasspath
com.android.tools:sdk-common:27.1.1=compileClasspath,testCompileClasspath
com.android.tools:sdklib:27.1.1=compileClasspath,testCompileClasspath
com.android:signflinger:4.1.1=compileClasspath,testCompileClasspath
com.android:zipflinger:4.1.1=compileClasspath,testCompileClasspath
com.google.android.gms:strict-version-matcher-plugin:1.2.2=compileClasspath,testCompileClasspath
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,testCompileClasspath
com.google.code.gson:gson:2.8.5=compileClasspath,testCompileClasspath
Expand All @@ -46,6 +47,7 @@ com.google.j2objc:j2objc-annotations:1.3=compileClasspath,testCompileClasspath
com.google.jimfs:jimfs:1.1=compileClasspath,testCompileClasspath
com.google.protobuf:protobuf-java-util:3.10.0=compileClasspath,testCompileClasspath
com.google.protobuf:protobuf-java:3.10.0=compileClasspath,testCompileClasspath
com.google.test.platform:core-proto:0.0.2-dev=compileClasspath,testCompileClasspath
com.googlecode.json-simple:json-simple:1.1=compileClasspath,testCompileClasspath
com.googlecode.juniversalchardet:juniversalchardet:1.0.3=compileClasspath,testCompileClasspath
com.squareup:javapoet:1.10.0=compileClasspath,testCompileClasspath
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/com/onesignal/androidsdk/GradleTestTemplate.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:4.0.2'
(GRADLE_LATEST_VERSION): 'com.android.tools.build:gradle:4.1.1'
]

buildArgumentSets = [
Expand Down

0 comments on commit 4c447bb

Please sign in to comment.