Upgrade to Android Gradle Plugin 7.2.1 (#1) (#2)

Upgrade to Gradle 7.3.3 Update JVM target to 11 Added dependencies that have been moved Co-authored-by: Robert Chrzanowski <rchrzanowski@wayfair.com>
wayfair-contribs · Jul 19, 2022 · eb93836 · eb93836
1 parent df45251
commit eb93836
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 20 deletions.
diff --git a/buildSrc/src/main/groovy/dependencies.gradle b/buildSrc/src/main/groovy/dependencies.gradle
@@ -13,8 +13,11 @@ ext {
       // Build and upload with:
       // ./gradlew clean assemble publish --no-daemon --no-parallel
       gradleMavenPublishPlugin : 'com.vanniktech:gradle-maven-publish-plugin:0.18.0',
-      androidPlugin            : 'com.android.tools.build:gradle:4.2.0',
+      androidPlugin            : 'com.android.tools.build:gradle:7.2.1',
       nexusPlugin              : 'com.bmuschko:gradle-nexus-plugin:2.3.1',
+      builderTestApi           : 'com.android.tools.build:builder-test-api:7.2.1',
+      toolsCommon              : 'com.android.tools:common:30.2.1',
+      commonsIo                : 'commons-io:commons-io:2.11.0',
       appcompat                : "androidx.appcompat:appcompat:1.4.1",
       androidXAnnotations      : "androidx.annotation:annotation:1.3.0",
       guava                    : "com.google.guava:guava:31.0.1-android",

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Jul 13 13:40:38 EDT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/okreplay-espresso/build.gradle b/okreplay-espresso/build.gradle
@@ -23,12 +23,12 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 
   kotlinOptions {
-    jvmTarget = '1.8'
+    jvmTarget = JavaVersion.VERSION_11
   }
 }
 

diff --git a/okreplay-gradle-plugin/build.gradle b/okreplay-gradle-plugin/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'java-gradle-plugin'
 apply plugin: 'com.vanniktech.maven.publish'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
 dependencies {
   compileOnly gradleApi()
   compileOnly dep.androidPlugin
   compileOnly dep.ddmlib
   implementation dep.kotlinStdLib
+  implementation dep.builderTestApi
+  implementation dep.toolsCommon
+  implementation dep.commonsIo
   testImplementation gradleTestKit()
   testImplementation dep.androidPlugin
   testImplementation dep.ddmlib
@@ -23,6 +23,6 @@ test {
   testLogging.showStandardStreams = isCi
 }
 
-validateTaskProperties {
+validatePlugins {
   failOnWarning = true
 }
diff --git a/okreplay-gradle-plugin/src/main/kotlin/okreplay/DeviceBridge.kt b/okreplay-gradle-plugin/src/main/kotlin/okreplay/DeviceBridge.kt
@@ -20,7 +20,7 @@ internal interface DeviceBridge {
 }
 
 internal class RealDeviceBridge(adbPath: File, adbTimeoutMs: Int, private val logger: Logger) : DeviceBridge {
-  private val deviceProvider = ConnectedDeviceProvider(adbPath, adbTimeoutMs, LoggerWrapper(logger))
+  private val deviceProvider = ConnectedDeviceProvider(adbPath, adbTimeoutMs, LoggerWrapper(logger), null)
 
   override fun use(block: DeviceBridge.() -> Unit) {
     try {

diff --git a/okreplay-gradle-plugin/src/test/testProject/android/buildScriptFixtures/basic.gradle b/okreplay-gradle-plugin/src/test/testProject/android/buildScriptFixtures/basic.gradle
@@ -1,6 +1,6 @@
 buildscript {
   ext.VERSION_NAME='1.5.0-SNAPSHOT'
-  apply from: "../../../../gradle/dependencies.gradle"
+  apply from: "../../../../buildSrc/src/main/groovy/dependencies.gradle"
   repositories {
     jcenter()
     google()
@@ -33,4 +33,4 @@ repositories {
 
 dependencies {
   implementation dep.appcompat
-}
+}
diff --git a/okreplay-sample/build.gradle b/okreplay-sample/build.gradle
@@ -33,12 +33,12 @@ android {
   }
 
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_1_8
-      targetCompatibility JavaVersion.VERSION_1_8
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
   }
 
   kotlinOptions {
-      jvmTarget = '1.8'
+      jvmTarget = JavaVersion.VERSION_11
   }
 
   useLibrary 'android.test.runner'

diff --git a/okreplay-tests/build.gradle b/okreplay-tests/build.gradle
@@ -13,12 +13,12 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 
   kotlinOptions {
-    jvmTarget = '1.8'
+    jvmTarget = JavaVersion.VERSION_11
   }
 }
 
@@ -40,4 +40,4 @@ dependencies {
   testImplementation dep.mockWebServer
 }
 
-apply from: "$rootDir/gradle/checkstyle.gradle"
+apply from: "$rootDir/gradle/checkstyle.gradle"