Bump Kotlin, JDK, Compose, Gradle, etc.

uber · Oct 14, 2024 · 685bd46 · 685bd46
1 parent 6cf61b1
commit 685bd46
Show file tree

Hide file tree

Showing 34 changed files with 205 additions and 195 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         # TODO Add 9, 10, 11, 12, and 13 after Kotlin 1.3.60
-        java_version: [11]
+        java_version: [17]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/android/build.gradle → android/build.gradle.kts b/android/build.gradle → android/build.gradle.kts
@@ -17,7 +17,9 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.symbol.processor) apply false
     alias(libs.plugins.kotlin.kapt) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.maven.publish) apply false
     alias(libs.plugins.errorprone) apply false
     alias(libs.plugins.nullaway) apply false

diff --git a/android/conventions/build.gradle.kts b/android/conventions/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 plugins {
     `kotlin-dsl`
-    `kotlin-dsl-precompiled-script-plugins`
+    alias(libs.plugins.spotless)
 }
 
 repositories {

diff --git a/android/conventions/src/main/kotlin/Extensions.kt b/android/conventions/src/main/kotlin/Extensions.kt
@@ -14,34 +14,25 @@
  * limitations under the License.
  */
 import com.android.build.gradle.AbstractAppExtension
-import com.android.build.gradle.LibraryExtension
-import com.android.build.gradle.TestedExtension
 import com.android.build.gradle.api.BaseVariant
 import net.ltgt.gradle.errorprone.CheckSeverity
 import net.ltgt.gradle.errorprone.errorprone
 import net.ltgt.gradle.nullaway.nullaway
 
 fun AbstractAppExtension.errorprone() {
   applicationVariants.configureEach { errorprone() }
-  testErrorprone()
-}
-
-fun LibraryExtension.errorprone() {
-  libraryVariants.configureEach { errorprone() }
-  testErrorprone()
-}
-
-fun TestedExtension.testErrorprone() {
   testVariants.configureEach { errorprone() }
   unitTestVariants.configureEach { errorprone() }
 }
 
-fun BaseVariant.errorprone() {
+private fun BaseVariant.errorprone() {
   javaCompileProvider.configure {
-    options.errorprone.nullaway {
-      severity.set(CheckSeverity.ERROR)
-      annotatedPackages.add("com.uber")
+    options.errorprone {
+      nullaway {
+        severity.set(CheckSeverity.ERROR)
+        annotatedPackages.add("com.uber")
+      }
+      excludedPaths.set(".*/build/generated/.*")
     }
-    options.errorprone.excludedPaths.set(".*/build/generated/.*")
   }
 }
diff --git a/android/conventions/src/main/kotlin/ribs.kotlin-android-application-conventions.gradle.kts b/android/conventions/src/main/kotlin/ribs.kotlin-android-application-conventions.gradle.kts
@@ -24,40 +24,36 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {
-    compileSdk = 33
-
+    compileSdk = 34
     defaultConfig {
         minSdk = 21
-        targetSdk = 28
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
     }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+    buildFeatures {
+        buildConfig = true
     }
-
     // No need for lint. Those are just tutorials.
     lint {
         abortOnError = false
         quiet = true
     }
-
     buildTypes {
         debug {
             matchingFallbacks.add("release")
         }
     }
-
-    sourceSets {
-        getByName("main").java.srcDir("src/main/kotlin")
-        getByName("test").java.srcDir("src/test/kotlin")
-        getByName("androidTest").java.srcDir("src/androidTest/kotlin")
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
     }
 }
 
@@ -71,9 +67,6 @@ androidComponents {
 
 tasks.withType<KotlinCompile>().configureEach {
     compilerOptions {
-        freeCompilerArgs.addAll(
-            "-Xjvm-default=all",
-            "-opt-in=kotlin.RequiresOptIn",
-        )
+        freeCompilerArgs.add("-Xjvm-default=all")
     }
 }
diff --git a/android/conventions/src/main/kotlin/ribs.kotlin-android-library-conventions.gradle.kts b/android/conventions/src/main/kotlin/ribs.kotlin-android-library-conventions.gradle.kts
@@ -24,30 +24,28 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(17)
+    explicitApi()
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
     }
 
-    // This can be removed on AGP 8.1.0-alpha09 onwards, since we are using JVM Toolchain
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
-    buildFeatures {
-        buildConfig = false
+    kotlinOptions {
+        jvmTarget = "11"
     }
 
-    sourceSets {
-        getByName("main").java.srcDir("src/main/kotlin")
-        getByName("test").java.srcDir("src/test/kotlin")
-        getByName("androidTest").java.srcDir("src/androidTest/kotlin")
+    buildFeatures {
+        buildConfig = false
     }
 
     testOptions {
@@ -67,10 +65,6 @@ androidComponents {
 
 tasks.withType<KotlinCompile>().configureEach {
     compilerOptions {
-        freeCompilerArgs.addAll(
-            "-Xexplicit-api=warning",
-            "-Xjvm-default=all",
-            "-opt-in=kotlin.RequiresOptIn",
-        )
+        freeCompilerArgs.add("-Xjvm-default=all")
     }
 }
diff --git a/android/conventions/src/main/kotlin/ribs.kotlin-library-conventions.gradle.kts b/android/conventions/src/main/kotlin/ribs.kotlin-library-conventions.gradle.kts
@@ -13,18 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.jvm.JvmTargetValidationMode
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+
 plugins {
     kotlin("jvm")
     id("ribs.spotless-convention")
 }
 
-kotlin {
-    jvmToolchain(8)
-    explicitApi()
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
-tasks.named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask::class.java) {
+kotlin {
+    jvmToolchain(17)
+    explicitApi()
     compilerOptions {
         freeCompilerArgs.add("-Xjvm-default=all")
+        jvmTarget = JvmTarget.JVM_11
     }
 }
+
+tasks.withType<KotlinJvmCompile>().configureEach {
+    jvmTargetValidationMode = JvmTargetValidationMode.WARNING
+}
diff --git a/android/demos/compose/build.gradle b/android/demos/compose/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id("ribs.kotlin-android-application-conventions")
-    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.kotlin.symbol.processor)
 }
 
 android {
@@ -12,13 +13,14 @@ android {
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.compiler.get()
-    }
 }
 
 dependencies {
-    kapt(libs.motif.compiler)
+    def composeBom = platform(libs.compose.bom)
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+
+    ksp(libs.motif.compiler)
     implementation(project(":libraries:rib-android"))
     implementation(project(":libraries:rib-android-compose"))
     implementation(project(":libraries:rib-coroutines"))

diff --git a/android/demos/memory-leaks/src/main/java/com/uber/rib/SampleApplication.java b/android/demos/memory-leaks/src/main/java/com/uber/rib/SampleApplication.java
@@ -16,47 +16,39 @@
 package com.uber.rib;
 
 import android.app.Application;
-import com.squareup.leakcanary.LeakCanary;
-import com.squareup.leakcanary.RefWatcher;
 import com.uber.rib.core.ActivityDelegate;
 import com.uber.rib.core.HasActivityDelegate;
 import com.uber.rib.core.RibRefWatcher;
-import java.util.concurrent.TimeUnit;
+import leakcanary.AppWatcher;
+import org.jetbrains.annotations.NotNull;
 
-public class SampleApplication extends Application implements HasActivityDelegate {
+public class SampleApplication extends Application
+    implements HasActivityDelegate, RibRefWatcher.ReferenceWatcher {
 
   private SampleActivityDelegate activityDelegate;
 
   @Override
   public void onCreate() {
     activityDelegate = new SampleActivityDelegate();
     super.onCreate();
-    if (!LeakCanary.isInAnalyzerProcess(this)) {
-      // This process is dedicated to LeakCanary for heap analysis. You should not init your app in
-      // this process.
-      installLeakCanary();
-    }
+    installLeakCanary();
   }
 
   /** Install leak canary for both activities and RIBs. */
   private void installLeakCanary() {
-    final RefWatcher refWatcher =
-        LeakCanary.refWatcher(this).watchDelay(2, TimeUnit.SECONDS).buildAndInstall();
-    LeakCanary.install(this);
-    RibRefWatcher.getInstance()
-        .setReferenceWatcher(
-            new RibRefWatcher.ReferenceWatcher() {
-              @Override
-              public void watch(Object object) {
-                refWatcher.watch(object);
-              }
+    final RibRefWatcher watcher = RibRefWatcher.getInstance();
+    watcher.setReferenceWatcher(this);
+    watcher.enableLeakCanary();
+  }
 
-              @Override
-              public void logBreadcrumb(String eventType, String data, String parent) {
-                // Ignore for now. Useful for collecting production analytics.
-              }
-            });
-    RibRefWatcher.getInstance().enableLeakCanary();
+  @Override
+  public void watch(Object objectToWatch) {
+    AppWatcher.INSTANCE.getObjectWatcher().watch(objectToWatch);
+  }
+
+  @Override
+  public void logBreadcrumb(String eventType, @NotNull String data, @NotNull String parent) {
+    // Ignore for now. Useful for collecting production analytics.
   }
 
   @Override

diff --git a/android/demos/rib-workers/build.gradle b/android/demos/rib-workers/build.gradle
@@ -1,5 +1,7 @@
 plugins {
     id("ribs.kotlin-android-application-errorprone-conventions")
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.kotlin.symbol.processor)
 }
 
 android {
@@ -11,13 +13,14 @@ android {
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.compiler.get()
-    }
 }
 
 dependencies {
-    kapt(libs.motif.compiler)
+    def composeBom = platform(libs.compose.bom)
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+
+    ksp(libs.motif.compiler)
     implementation(project(":libraries:rib-android"))
     implementation(project(":libraries:rib-android-compose"))
     implementation(project(":libraries:rib-coroutines"))