Upgrade to AGP 8 & Kotlin 1.9.10 (#324)

* Upgrade to AGP 8 & Kotlin 1.9.20 * Use java 17 * Update jacoco version * Fix namespace in stopwatch * Update compose version & remove namespace from manifest files * Fix compilation errors, update mockito * Update compile sdk to 33 * Update compile sdk to 34 * Update to latest versions of mockito * Fix for mockito test * Fix test compilation error * Fix test compilation error * Revert change with R namespace change, update robolectric * Use kotlin 1.9.10 to match IC App * Revert to compose 1.5.3 which supports kotlin 1.9.10 * Use jdk 18 * Fix mockito. * Use java 18. --------- Co-authored-by: Laimonas Turauskas <[email protected]>
instacart · Jan 4, 2024 · 0aa265d · 0aa265d
1 parent 2d1405a
commit 0aa265d
Show file tree

Hide file tree

Showing 37 changed files with 133 additions and 262 deletions.
diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
@@ -6,6 +6,11 @@ jobs:
     env:
       DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
     steps:
+      - name: Configure JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 18
       - name: Checkout the code
         uses: actions/checkout@v2
       - name: Install Ruby
@@ -42,6 +47,11 @@ jobs:
   assemble_samples:
     runs-on: ubuntu-latest
     steps:
+      - name: Configure JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 18
       - name: Checkout the code
         uses: actions/checkout@v2
       - name: Assemble Counter

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,8 @@
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.LibraryExtension
+import com.android.build.api.dsl.TestExtension
+
 buildscript {
 
     repositories {
@@ -20,22 +25,79 @@ buildscript {
 apply(plugin = "com.github.ben-manes.versions")
 apply(plugin = "org.jetbrains.dokka")
 apply(from = "gradle/jacoco.gradle")
-apply(from = "gradle/merge-reports.gradle")
 
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
+}
+
+subprojects {
+    val javaVersion = JavaVersion.VERSION_18
 
     tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
         dokkaSourceSets.named("main") {
-            jdkVersion.set(8)
+            jdkVersion.set(11)
             skipDeprecated.set(true)
             skipEmptyPackages.set(true)
             reportUndocumented.set(false)
         }
     }
+
+    // Common android config
+    val commonAndroidConfig: CommonExtension<*, *, *, *, *>.() -> Unit = {
+        compileSdk = 34
+
+        compileOptions {
+            sourceCompatibility = javaVersion
+            targetCompatibility = javaVersion
+        }
+    }
+
+    // Android library config
+    pluginManager.withPlugin("com.android.library") {
+        with(extensions.getByType<LibraryExtension>()) {
+            commonAndroidConfig()
+            defaultConfig { minSdk = 21 }
+        }
+    }
+
+    // Android app config
+    pluginManager.withPlugin("com.android.application") {
+        with(extensions.getByType<ApplicationExtension>()) {
+            commonAndroidConfig()
+            defaultConfig {
+                minSdk = 21
+                //noinspection ExpiredTargetSdkVersion
+                targetSdk = 30
+            }
+        }
+    }
+
+    // Android test config
+    pluginManager.withPlugin("com.android.test") {
+        with(extensions.getByType<TestExtension>()) {
+            commonAndroidConfig()
+            defaultConfig {
+                // Using sdk 28 for robolectric tests.
+                minSdk = 28
+                //noinspection ExpiredTargetSdkVersion
+                targetSdk = 28
+            }
+        }
+    }
+
+    tasks.withType<JavaCompile>().configureEach {
+        sourceCompatibility = javaVersion.toString()
+        targetCompatibility = javaVersion.toString()
+    }
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+        kotlinOptions {
+            jvmTarget = javaVersion.toString()
+        }
+    }
 }
 
 tasks.register("clean", Delete::class) {
@@ -53,3 +115,4 @@ tasks.register("install") {
     dependsOn(publishTasks)
 }
 
+apply(from = "gradle/merge-reports.gradle")
diff --git a/formula-android-compose/build.gradle.kts b/formula-android-compose/build.gradle.kts
@@ -9,34 +9,17 @@ apply {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.targetSdk.get().toInt()
-    }
+    namespace = "com.instacart.formula.android.compose"
 
     buildFeatures {
         compose = true
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
     composeOptions {
-        kotlinCompilerVersion = libs.versions.kotlin.get()
         kotlinCompilerExtensionVersion = libs.versions.compose.get()
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
 task<Jar>("sourcesJar") {
     from(android.sourceSets["main"].java.srcDirs)
     archiveClassifier.set("sources")
@@ -45,8 +28,10 @@ task<Jar>("sourcesJar") {
 task<Javadoc>("javadoc") {
     isFailOnError = false
     source(android.sourceSets["main"].java.getSourceFiles())
-    classpath += project.files(android.bootClasspath.joinToString(separator = File.pathSeparator))
-    classpath += configurations.api
+    classpath = project.files(
+        android.bootClasspath.joinToString(separator = File.pathSeparator),
+        configurations.api,
+    )
 }
 
 task<Jar>("javadocJar") {

diff --git a/formula-android-compose/src/main/AndroidManifest.xml b/formula-android-compose/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.instacart.formula.android.compose"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/...android-compose/src/main/java/com/instacart/formula/android/compose/ComposeViewFactory.kt b/...android-compose/src/main/java/com/instacart/formula/android/compose/ComposeViewFactory.kt
@@ -10,7 +10,7 @@ import com.instacart.formula.android.ViewFactory
 import com.jakewharton.rxrelay3.BehaviorRelay
 
 
-abstract class ComposeViewFactory<RenderModel> : ViewFactory<RenderModel> {
+abstract class ComposeViewFactory<RenderModel : Any> : ViewFactory<RenderModel> {
 
     override fun create(inflater: LayoutInflater, container: ViewGroup?): FeatureView<RenderModel> {
         val view = ComposeView(inflater.context)

diff --git a/formula-android-tests/build.gradle.kts b/formula-android-tests/build.gradle.kts
@@ -9,21 +9,14 @@ apply {
 }
 
 android {
-    compileSdk = 28
+    namespace = "com.instacart.formula"
     defaultConfig {
-        applicationId = "com.instacart.formula.samples"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = 28 // Using sdk 28 for robolectric tests.
+        applicationId = "com.instacart.formula"
         versionCode = 1
         versionName = "1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -38,12 +31,6 @@ android {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
 dependencies {
     implementation(project(":formula-rxjava3"))
     implementation(project(":formula-android"))

diff --git a/formula-android-tests/src/main/AndroidManifest.xml b/formula-android-tests/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.instacart.formula">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true"
         android:label="@string/app_name"

diff --git a/formula-android/build.gradle.kts b/formula-android/build.gradle.kts
@@ -11,29 +11,13 @@ apply {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.targetSdk.get().toInt()
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
+    namespace = "com.instacart.formula.android"
 
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
 task<Jar>("sourcesJar") {
     from(android.sourceSets["main"].java.srcDirs)
     archiveClassifier.set("sources")
@@ -42,8 +26,10 @@ task<Jar>("sourcesJar") {
 task<Javadoc>("javadoc") {
     isFailOnError = false
     source(android.sourceSets["main"].java.getSourceFiles())
-    classpath += project.files(android.bootClasspath.joinToString(separator = File.pathSeparator))
-    classpath += configurations.api
+    classpath = project.files(
+        android.bootClasspath.joinToString(separator = File.pathSeparator),
+        configurations.api,
+    )
 }
 
 task<Jar>("javadocJar") {
@@ -69,7 +55,7 @@ dependencies {
     testImplementation(libs.androidx.test.runner)
     testImplementation(libs.espresso.core)
     testImplementation(libs.truth)
-    testImplementation(libs.mockito.inline)
+    testImplementation(libs.mockito.core)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.kotlin.reflect)
 }
diff --git a/formula-android/src/main/AndroidManifest.xml b/formula-android/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.instacart.formula.android"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/formula-android/src/test/java/com/instacart/formula/MockitoFormulaTest.kt b/formula-android/src/test/java/com/instacart/formula/MockitoFormulaTest.kt
@@ -1,11 +1,10 @@
 package com.instacart.formula
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.mock
-import com.nhaarman.mockito_kotlin.spy
-import com.nhaarman.mockito_kotlin.whenever
 import org.junit.Test
 import org.mockito.internal.stubbing.answers.CallsRealMethods
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 
 class MockitoFormulaTest {
 

diff --git a/formula-android/src/test/java/com/instacart/formula/android/ActivityStoreContextTest.kt b/formula-android/src/test/java/com/instacart/formula/android/ActivityStoreContextTest.kt
@@ -4,14 +4,14 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import com.instacart.formula.android.internal.ActivityStoreContextImpl
 import com.jakewharton.rxrelay3.PublishRelay
-import com.nhaarman.mockito_kotlin.mock
-import com.nhaarman.mockito_kotlin.verify
-import com.nhaarman.mockito_kotlin.verifyZeroInteractions
-import com.nhaarman.mockito_kotlin.whenever
 import io.reactivex.rxjava3.core.Observable
 import kotlinx.parcelize.Parcelize
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import org.mockito.kotlin.whenever
 
 class ActivityStoreContextTest {
     class FakeActivity : FragmentActivity() {
@@ -58,7 +58,7 @@ class ActivityStoreContextTest {
             doSomething()
         }
 
-        verifyZeroInteractions(activity)
+        verifyNoInteractions(activity)
     }
 
     @Test fun `send event success`() {

diff --git a/formula-android/src/test/java/com/instacart/formula/android/ActivityStoreFactoryTest.kt b/formula-android/src/test/java/com/instacart/formula/android/ActivityStoreFactoryTest.kt
@@ -3,8 +3,8 @@ package com.instacart.formula.android
 import androidx.fragment.app.FragmentActivity
 import com.google.common.truth.Truth.assertThat
 import com.instacart.formula.android.internal.ActivityStoreFactory
-import com.nhaarman.mockito_kotlin.mock
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class ActivityStoreFactoryTest {
 

diff --git a/formula-coroutines/build.gradle.kts b/formula-coroutines/build.gradle.kts
@@ -3,11 +3,6 @@ plugins {
     id("kotlin")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 dependencies {
     implementation(libs.kotlin)
     implementation(libs.coroutines)
@@ -18,10 +13,4 @@ dependencies {
     testImplementation(libs.truth)
     testImplementation(libs.junit)
     testImplementation(libs.coroutines.test)
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
-    }
 }
diff --git a/formula-lint/build.gradle.kts b/formula-lint/build.gradle.kts
@@ -10,11 +10,6 @@ apply {
   from("$rootDir/.buildscript/configure-signing.gradle")
 }
 
-java {
-  targetCompatibility = JavaVersion.VERSION_1_8
-  sourceCompatibility = JavaVersion.VERSION_1_8
-}
-
 dependencies {
   compileOnly(libs.lint.api)
   compileOnly(libs.lint.checks)

diff --git a/formula-rxjava3/build.gradle.kts b/formula-rxjava3/build.gradle.kts
@@ -7,21 +7,6 @@ apply {
     from("$rootDir/.buildscript/configure-signing.gradle")
 }
 
-repositories {
-    mavenCentral()
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
 dependencies {
     implementation(libs.kotlin)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<manifest package="com.instacart.formula.android.compose"/>
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>