Bump AGP to 7.1.0-alpha08
Signed-off-by: utzcoz <utzcoz@outlook.com>
diff --git a/build.gradle b/build.gradle
index 3a949fe..00c658b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@
dependencies {
gradle
- classpath 'com.android.tools.build:gradle:4.1.3'
+ classpath 'com.android.tools.build:gradle:7.1.0-alpha08'
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
classpath 'com.netflix.nebula:gradle-aggregate-javadocs-plugin:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index aeb7dc8..c38c50a 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -11,6 +11,8 @@
implementation gradleApi()
implementation localGroovy()
+ api "com.google.guava:guava:27.0.1-jre"
+ api 'org.jetbrains:annotations:16.0.2'
implementation "org.ow2.asm:asm-tree:9.0"
- implementation 'com.android.tools.build:gradle:4.1.3'
+ implementation 'com.android.tools.build:gradle:7.1.0-alpha08'
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da9702f..69a9715 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/integration_tests/agp/build.gradle b/integration_tests/agp/build.gradle
index 89cf106..806d9e5 100644
--- a/integration_tests/agp/build.gradle
+++ b/integration_tests/agp/build.gradle
@@ -21,7 +21,7 @@
dependencies {
// Testing dependencies
- testImplementation project(path: ':testapp', configuration: 'default')
+ testImplementation project(path: ':testapp')
testImplementation project(":robolectric")
testImplementation project(":integration_tests:agp:testsupport")
diff --git a/integration_tests/androidx/build.gradle b/integration_tests/androidx/build.gradle
index f1c517a..e9f282c 100644
--- a/integration_tests/androidx/build.gradle
+++ b/integration_tests/androidx/build.gradle
@@ -28,7 +28,7 @@
implementation("androidx.appcompat:appcompat:1.2.0")
// Testing dependencies
- testImplementation project(path: ':testapp', configuration: 'default')
+ testImplementation project(path: ':testapp')
testImplementation project(":robolectric")
testImplementation "junit:junit:${junitVersion}"
testImplementation("androidx.test:core:$axtVersion")
diff --git a/integration_tests/ctesque/build.gradle b/integration_tests/ctesque/build.gradle
index 47e7f4f..c8ab4f4 100644
--- a/integration_tests/ctesque/build.gradle
+++ b/integration_tests/ctesque/build.gradle
@@ -29,10 +29,14 @@
defaultConfig {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
+
+ aaptOptions {
+ noCompress 'txt'
+ }
}
dependencies {
- implementation project(path: ':testapp', configuration: 'default')
+ implementation project(path: ':testapp')
implementation project(path: ':shadowapi', configuration: 'default')
testImplementation project(":robolectric")
diff --git a/integration_tests/dependency-on-stubs/build.gradle b/integration_tests/dependency-on-stubs/build.gradle
index 0e7e861..6efe513 100644
--- a/integration_tests/dependency-on-stubs/build.gradle
+++ b/integration_tests/dependency-on-stubs/build.gradle
@@ -11,7 +11,7 @@
testImplementation files("${System.getenv("ANDROID_HOME")}/platforms/android-29/android.jar")
testCompileOnly AndroidSdk.MAX_SDK.coordinates // compile against latest Android SDK
- testRuntime AndroidSdk.MAX_SDK.coordinates
+ testRuntimeOnly AndroidSdk.MAX_SDK.coordinates
testImplementation "com.google.truth:truth:${truthVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0"
diff --git a/integration_tests/libphonenumber/build.gradle b/integration_tests/libphonenumber/build.gradle
index 6f6ea48..84be0c7 100644
--- a/integration_tests/libphonenumber/build.gradle
+++ b/integration_tests/libphonenumber/build.gradle
@@ -7,7 +7,7 @@
api "junit:junit:${junitVersion}"
compileOnly AndroidSdk.MAX_SDK.coordinates
- testRuntime AndroidSdk.MAX_SDK.coordinates
+ testRuntimeOnly AndroidSdk.MAX_SDK.coordinates
testImplementation "com.google.truth:truth:${truthVersion}"
testImplementation 'com.googlecode.libphonenumber:libphonenumber:8.0.0'
}
\ No newline at end of file
diff --git a/integration_tests/memoryleaks/build.gradle b/integration_tests/memoryleaks/build.gradle
index 66c7712..44e70e2 100644
--- a/integration_tests/memoryleaks/build.gradle
+++ b/integration_tests/memoryleaks/build.gradle
@@ -26,7 +26,7 @@
dependencies {
// Testing dependencies
- testImplementation project(path: ':testapp', configuration: 'default')
+ testImplementation project(path: ':testapp')
testImplementation project(":robolectric")
testImplementation "junit:junit:${junitVersion}"
testImplementation "com.google.guava:guava-testlib:29.0-jre"
diff --git a/integration_tests/mockito-experimental/build.gradle b/integration_tests/mockito-experimental/build.gradle
index 015e23b..47f91bf 100644
--- a/integration_tests/mockito-experimental/build.gradle
+++ b/integration_tests/mockito-experimental/build.gradle
@@ -11,7 +11,7 @@
compileOnly AndroidSdk.MAX_SDK.coordinates
testCompileOnly AndroidSdk.MAX_SDK.coordinates
- testRuntime AndroidSdk.MAX_SDK.coordinates
+ testRuntimeOnly AndroidSdk.MAX_SDK.coordinates
testImplementation "junit:junit:${junitVersion}"
testImplementation "com.google.truth:truth:${truthVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"
diff --git a/integration_tests/mockito/build.gradle b/integration_tests/mockito/build.gradle
index f97b06a..921b046 100644
--- a/integration_tests/mockito/build.gradle
+++ b/integration_tests/mockito/build.gradle
@@ -11,7 +11,7 @@
compileOnly AndroidSdk.MAX_SDK.coordinates
testCompileOnly AndroidSdk.MAX_SDK.coordinates
- testRuntime AndroidSdk.MAX_SDK.coordinates
+ testRuntimeOnly AndroidSdk.MAX_SDK.coordinates
testImplementation "junit:junit:${junitVersion}"
testImplementation "com.google.truth:truth:${truthVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
diff --git a/integration_tests/powermock/build.gradle b/integration_tests/powermock/build.gradle
index 9632774..be4180c 100644
--- a/integration_tests/powermock/build.gradle
+++ b/integration_tests/powermock/build.gradle
@@ -6,7 +6,7 @@
api project(":robolectric")
compileOnly AndroidSdk.MAX_SDK.coordinates
- testRuntime AndroidSdk.MAX_SDK.coordinates
+ testRuntimeOnly AndroidSdk.MAX_SDK.coordinates
testImplementation "junit:junit:${junitVersion}"
testImplementation "com.google.truth:truth:${truthVersion}"
diff --git a/integration_tests/security-providers/build.gradle b/integration_tests/security-providers/build.gradle
index 08d34ba..69d605b 100644
--- a/integration_tests/security-providers/build.gradle
+++ b/integration_tests/security-providers/build.gradle
@@ -7,7 +7,7 @@
api "junit:junit:${junitVersion}"
compileOnly AndroidSdk.MAX_SDK.coordinates
- testRuntime AndroidSdk.MAX_SDK.coordinates
+ testRuntimeOnly AndroidSdk.MAX_SDK.coordinates
testImplementation "com.google.truth:truth:${truthVersion}"
testImplementation "org.conscrypt:conscrypt-openjdk-uber:2.4.0"
testImplementation "com.squareup.okhttp3:okhttp"
diff --git a/robolectric/build.gradle b/robolectric/build.gradle
index 67f4f9f..17286d6 100755
--- a/robolectric/build.gradle
+++ b/robolectric/build.gradle
@@ -56,7 +56,7 @@
testImplementation "androidx.test:runner:$axtVersion"
testImplementation("com.google.guava:guava:27.0.1-jre")
testCompileOnly AndroidSdk.MAX_SDK.coordinates // compile against latest Android SDK
- testRuntime AndroidSdk.MAX_SDK.coordinates // run against whatever this JDK supports
+ testRuntimeOnly AndroidSdk.MAX_SDK.coordinates // run against whatever this JDK supports
}
test {
diff --git a/shadows/httpclient/build.gradle b/shadows/httpclient/build.gradle
index 86f8019..3dd106d 100644
--- a/shadows/httpclient/build.gradle
+++ b/shadows/httpclient/build.gradle
@@ -32,7 +32,7 @@
testImplementation "androidx.test.ext:junit:$axtJunitVersion"
testCompileOnly(AndroidSdk.LOLLIPOP_MR1.coordinates) { force = true }
- testRuntime AndroidSdk.LOLLIPOP_MR1.coordinates
+ testRuntimeOnly AndroidSdk.LOLLIPOP_MR1.coordinates
}
// httpcore needs to come before android-all on runtime classpath; the gradle IntelliJ plugin
diff --git a/shadows/playservices/build.gradle b/shadows/playservices/build.gradle
index 94d5a70..55af23f 100644
--- a/shadows/playservices/build.gradle
+++ b/shadows/playservices/build.gradle
@@ -30,9 +30,9 @@
testImplementation "junit:junit:4.13.1"
testImplementation "com.google.truth:truth:${truthVersion}"
testImplementation "org.mockito:mockito-core:2.5.4"
- testRuntime "com.android.support:support-fragment:28.0.0"
- testRuntime "com.google.android.gms:play-services-base:8.4.0"
- testRuntime "com.google.android.gms:play-services-basement:8.4.0"
+ testRuntimeOnly "com.android.support:support-fragment:28.0.0"
+ testRuntimeOnly "com.google.android.gms:play-services-base:8.4.0"
+ testRuntimeOnly "com.google.android.gms:play-services-basement:8.4.0"
- testRuntime AndroidSdk.MAX_SDK.coordinates
+ testRuntimeOnly AndroidSdk.MAX_SDK.coordinates
}
diff --git a/shadows/supportv4/build.gradle b/shadows/supportv4/build.gradle
index 02e62e0..ce9fdfe 100644
--- a/shadows/supportv4/build.gradle
+++ b/shadows/supportv4/build.gradle
@@ -51,13 +51,13 @@
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
earlyTestRuntime "org.hamcrest:hamcrest-junit:2.0.0.0"
- testRuntime AndroidSdk.MAX_SDK.coordinates
- testRuntime "com.android.support:support-v4:${supportLibraryVersions}"
- testRuntime "com.android.support:support-compat:${supportLibraryVersions}"
- testRuntime "com.android.support:support-core-ui:${supportLibraryVersions}"
- testRuntime "com.android.support:support-core-utils:${supportLibraryVersions}"
- testRuntime "com.android.support:support-fragment:${supportLibraryVersions}"
- testRuntime "com.android.support:support-media-compat:${supportLibraryVersions}"
+ testRuntimeOnly AndroidSdk.MAX_SDK.coordinates
+ testRuntimeOnly "com.android.support:support-v4:${supportLibraryVersions}"
+ testRuntimeOnly "com.android.support:support-compat:${supportLibraryVersions}"
+ testRuntimeOnly "com.android.support:support-core-ui:${supportLibraryVersions}"
+ testRuntimeOnly "com.android.support:support-core-utils:${supportLibraryVersions}"
+ testRuntimeOnly "com.android.support:support-fragment:${supportLibraryVersions}"
+ testRuntimeOnly "com.android.support:support-media-compat:${supportLibraryVersions}"
}
// hamcrest needs to come before junit on runtime classpath; the gradle IntelliJ plugin
