From 0aa265d124324d03bafe89fd73e1eb5d9cbd2903 Mon Sep 17 00:00:00 2001 From: Matt Kranzler Date: Thu, 4 Jan 2024 06:43:16 -0800 Subject: [PATCH] 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 --- .github/workflows/build-workflow.yml | 10 +++ build.gradle.kts | 67 ++++++++++++++++++- formula-android-compose/build.gradle.kts | 25 ++----- .../src/main/AndroidManifest.xml | 2 +- .../android/compose/ComposeViewFactory.kt | 2 +- formula-android-tests/build.gradle.kts | 17 +---- .../src/main/AndroidManifest.xml | 3 +- formula-android/build.gradle.kts | 26 ++----- formula-android/src/main/AndroidManifest.xml | 2 +- .../instacart/formula/MockitoFormulaTest.kt | 5 +- .../android/ActivityStoreContextTest.kt | 10 +-- .../android/ActivityStoreFactoryTest.kt | 2 +- formula-coroutines/build.gradle.kts | 11 --- formula-lint/build.gradle.kts | 5 -- formula-rxjava3/build.gradle.kts | 15 ----- formula-test/build.gradle.kts | 15 ----- formula/build.gradle.kts | 16 ----- .../com/instacart/formula/StatelessFormula.kt | 2 +- gradle/jacoco.gradle | 3 +- gradle/libs.versions.toml | 21 +++--- gradle/merge-reports.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 3 +- samples/composition/build.gradle.kts | 15 +---- .../composition/src/main/AndroidManifest.xml | 3 +- samples/counter/build.gradle.kts | 15 +---- samples/counter/src/main/AndroidManifest.xml | 3 +- .../build.gradle.kts | 15 +---- .../src/main/AndroidManifest.xml | 3 +- samples/stopwatch-compose/build.gradle.kts | 10 +-- .../src/main/AndroidManifest.xml | 3 +- samples/stopwatch-coroutines/build.gradle.kts | 17 +---- .../src/main/AndroidManifest.xml | 3 +- samples/stopwatch/build.gradle.kts | 17 +---- .../stopwatch/src/main/AndroidManifest.xml | 3 +- samples/todoapp/build.gradle.kts | 17 +---- samples/todoapp/src/main/AndroidManifest.xml | 3 +- settings.gradle.kts | 2 - 37 files changed, 133 insertions(+), 262 deletions(-) diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml index 277b20609..4f24a6d05 100644 --- 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 index aaa8d002b..77398c20b 100644 --- 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().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()) { + commonAndroidConfig() + defaultConfig { minSdk = 21 } + } + } + + // Android app config + pluginManager.withPlugin("com.android.application") { + with(extensions.getByType()) { + commonAndroidConfig() + defaultConfig { + minSdk = 21 + //noinspection ExpiredTargetSdkVersion + targetSdk = 30 + } + } + } + + // Android test config + pluginManager.withPlugin("com.android.test") { + with(extensions.getByType()) { + commonAndroidConfig() + defaultConfig { + // Using sdk 28 for robolectric tests. + minSdk = 28 + //noinspection ExpiredTargetSdkVersion + targetSdk = 28 + } + } + } + + tasks.withType().configureEach { + sourceCompatibility = javaVersion.toString() + targetCompatibility = javaVersion.toString() + } + + tasks.withType().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 index 4875319da..551179d49 100644 --- 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().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - task("sourcesJar") { from(android.sourceSets["main"].java.srcDirs) archiveClassifier.set("sources") @@ -45,8 +28,10 @@ task("sourcesJar") { task("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("javadocJar") { diff --git a/formula-android-compose/src/main/AndroidManifest.xml b/formula-android-compose/src/main/AndroidManifest.xml index 42519c3f1..c4e6c98d7 100644 --- a/formula-android-compose/src/main/AndroidManifest.xml +++ b/formula-android-compose/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/formula-android-compose/src/main/java/com/instacart/formula/android/compose/ComposeViewFactory.kt b/formula-android-compose/src/main/java/com/instacart/formula/android/compose/ComposeViewFactory.kt index 6c5b76786..9e994616b 100644 --- a/formula-android-compose/src/main/java/com/instacart/formula/android/compose/ComposeViewFactory.kt +++ b/formula-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 : ViewFactory { +abstract class ComposeViewFactory : ViewFactory { override fun create(inflater: LayoutInflater, container: ViewGroup?): FeatureView { val view = ComposeView(inflater.context) diff --git a/formula-android-tests/build.gradle.kts b/formula-android-tests/build.gradle.kts index 455f0f35d..e0e81567a 100644 --- 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().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 index 4ff543a83..c48ff6712 100644 --- a/formula-android-tests/src/main/AndroidManifest.xml +++ b/formula-android-tests/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + ().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - task("sourcesJar") { from(android.sourceSets["main"].java.srcDirs) archiveClassifier.set("sources") @@ -42,8 +26,10 @@ task("sourcesJar") { task("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("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 index ca7d3e564..c4e6c98d7 100644 --- a/formula-android/src/main/AndroidManifest.xml +++ b/formula-android/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/formula-android/src/test/java/com/instacart/formula/MockitoFormulaTest.kt b/formula-android/src/test/java/com/instacart/formula/MockitoFormulaTest.kt index 4af5a1c6e..3aba8e80f 100644 --- 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 index 1636951b0..04c3dc5f7 100644 --- 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 index 63b520310..5f1f06798 100644 --- 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 index 36240d14e..7a687486d 100644 --- 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().all { - kotlinOptions { - freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" - } } \ No newline at end of file diff --git a/formula-lint/build.gradle.kts b/formula-lint/build.gradle.kts index 4658ff7a2..f3c0fb154 100644 --- 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 index 2851693c4..8de29d1b5 100644 --- 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().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - dependencies { implementation(libs.kotlin) diff --git a/formula-test/build.gradle.kts b/formula-test/build.gradle.kts index 0c3b9b2e4..4ce868c5b 100644 --- a/formula-test/build.gradle.kts +++ b/formula-test/build.gradle.kts @@ -7,21 +7,6 @@ apply { from("$rootDir/.buildscript/configure-signing.gradle") } -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -repositories { - mavenCentral() -} - -tasks.withType().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - dependencies { implementation(libs.kotlin) api(project(":formula-rxjava3")) diff --git a/formula/build.gradle.kts b/formula/build.gradle.kts index 0ec95f5a7..f35a685e9 100644 --- a/formula/build.gradle.kts +++ b/formula/build.gradle.kts @@ -7,22 +7,6 @@ apply { from("$rootDir/.buildscript/configure-signing.gradle") } -repositories { - mavenCentral() -} - - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -tasks.withType().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - dependencies { implementation(libs.kotlin) diff --git a/formula/src/main/java/com/instacart/formula/StatelessFormula.kt b/formula/src/main/java/com/instacart/formula/StatelessFormula.kt index 2a8bba7f5..164cfacd4 100644 --- a/formula/src/main/java/com/instacart/formula/StatelessFormula.kt +++ b/formula/src/main/java/com/instacart/formula/StatelessFormula.kt @@ -13,7 +13,7 @@ package com.instacart.formula abstract class StatelessFormula : IFormula { // Implements the common API used by the runtime. - private val implementation = object : Formula() { + private val implementation: Formula = object : Formula() { override fun initialState(input: Input) = Unit override fun Snapshot.evaluate(): Evaluation { diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle index 2eaf7b6a5..b0e9ae965 100644 --- a/gradle/jacoco.gradle +++ b/gradle/jacoco.gradle @@ -1,8 +1,7 @@ apply plugin: "com.vanniktech.android.junit.jacoco" junitJacoco { - // WARNING! Don"t upgrade unless https://github.com/Malinskiy/danger-jacoco/issues/10 is fixed - jacocoVersion = '0.8.2' + jacocoVersion = '0.8.8' excludes = [ // Defaults '**/androidx/**/*.*', diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7c023a87c..73ea4971b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,17 @@ [versions] -android-gradle = "7.0.4" +android-gradle = "8.2.0" dokka-gradle = "1.4.32" -minSdk = "21" -compileSdk = "30" -targetSdk = "30" - -kotlin = "1.5.21" +kotlin = "1.9.10" coroutines = "1.5.2" -compose = "1.0.1" +compose = "1.5.3" androidX = "1.2.0" lifecycle = "2.2.0" lifecycleKtx = '2.4.0-alpha03' androidTest = "1.4.0" espresso = "3.4.0" -robolectric = "4.6.1" +robolectric = "4.11.1" lint = "30.0.0" autoService = "1.0-rc7" @@ -26,7 +22,10 @@ dokka-gradle = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref dokka-android-gradle = { module = "org.jetbrains.dokka:android-documentation-plugin", version.ref = "dokka-gradle" } maven-publish-gradle = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.14.2" } version-gradle = { module = "com.github.ben-manes:gradle-versions-plugin", version = "0.38.0" } -jacoco-gradle = { module = "com.vanniktech:gradle-android-junit-jacoco-plugin", version = "0.16.0" } + +# We need to fork the plugin to fix an incorrect usage of tasks.withType(Test) +# https://github.com/vanniktech/gradle-android-junit-jacoco-plugin/compare/master...Laimiux:gradle-android-junit-jacoco-plugin:laimonas/gradle-8?expand=1 +jacoco-gradle = { module = "com.github.Jawnnypoo:gradle-android-junit-jacoco-plugin", version = "61a9cc0129" } kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } @@ -65,8 +64,8 @@ truth = { module = "com.google.truth:truth", version = "1.1.3" } junit = { module = "junit:junit", version = "4.13.2" } rxrelays = { module = "com.jakewharton.rxrelay3:rxrelay", version = "3.0.1" } -mockito-inline = { module = "org.mockito:mockito-inline", version = "3.12.4" } -mockito-kotlin = { module = "com.nhaarman:mockito-kotlin", version = "1.6.0" } +mockito-core = { module = "org.mockito:mockito-core", version = "5.7.0" } +mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "5.2.1" } lint-core = { module = "com.android.tools.lint:lint", version.ref = "lint" } lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lint" } diff --git a/gradle/merge-reports.gradle b/gradle/merge-reports.gradle index 4b20b16d5..3aa6c075d 100644 --- a/gradle/merge-reports.gradle +++ b/gradle/merge-reports.gradle @@ -24,7 +24,7 @@ afterEvaluate { } task mergeReports(type: Copy) { - from { testTasks*.reports.junitXml.destination } { + from { file("$buildDir/test-results") } { exclude("**/binary/*") } into { file("$buildDir/reports/allTests") } @@ -39,7 +39,7 @@ def disableHtmlTestReport(Project project) { project.android { testOptions { unitTests.all { - reports.html.enabled = false + reports.html.required = false } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a254..bcc902a2f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Dec 13 14:59:32 PST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/composition/build.gradle.kts b/samples/composition/build.gradle.kts index ab1f8d315..9e50cc65a 100644 --- a/samples/composition/build.gradle.kts +++ b/samples/composition/build.gradle.kts @@ -5,22 +5,15 @@ plugins { } android { - compileSdk = libs.versions.compileSdk.get().toInt() + namespace = "com.instacart.formula.samples.composition" defaultConfig { applicationId = "com.instacart.formula.samples.composition" - minSdk = libs.versions.minSdk.get().toInt() - targetSdk = libs.versions.targetSdk.get().toInt() 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 @@ -35,12 +28,6 @@ android { } } -tasks.withType().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - dependencies { implementation(project(":formula-rxjava3")) diff --git a/samples/composition/src/main/AndroidManifest.xml b/samples/composition/src/main/AndroidManifest.xml index 5c78cc3da..45a0419db 100644 --- a/samples/composition/src/main/AndroidManifest.xml +++ b/samples/composition/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + ().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - dependencies { implementation(project(":formula-rxjava3")) diff --git a/samples/counter/src/main/AndroidManifest.xml b/samples/counter/src/main/AndroidManifest.xml index 1793d76ff..5e7028ff6 100644 --- a/samples/counter/src/main/AndroidManifest.xml +++ b/samples/counter/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + ().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - dependencies { implementation(project(":formula-rxjava3")) diff --git a/samples/custom-network-state-stream/src/main/AndroidManifest.xml b/samples/custom-network-state-stream/src/main/AndroidManifest.xml index 168eb41a4..3eaf77d7c 100644 --- a/samples/custom-network-state-stream/src/main/AndroidManifest.xml +++ b/samples/custom-network-state-stream/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + ().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - dependencies { implementation(project(":formula-coroutines")) diff --git a/samples/stopwatch-coroutines/src/main/AndroidManifest.xml b/samples/stopwatch-coroutines/src/main/AndroidManifest.xml index 4f77e7dff..6d15095b0 100644 --- a/samples/stopwatch-coroutines/src/main/AndroidManifest.xml +++ b/samples/stopwatch-coroutines/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + ().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - dependencies { implementation(project(":formula-rxjava3")) diff --git a/samples/stopwatch/src/main/AndroidManifest.xml b/samples/stopwatch/src/main/AndroidManifest.xml index 4f77e7dff..6d15095b0 100644 --- a/samples/stopwatch/src/main/AndroidManifest.xml +++ b/samples/stopwatch/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + ().all { - kotlinOptions { - jvmTarget = "1.8" - } -} - dependencies { implementation(project(":formula-rxjava3")) implementation(project(":formula-android")) @@ -56,7 +43,7 @@ dependencies { testImplementation(libs.junit) testImplementation(libs.truth) - testImplementation(libs.mockito.inline) + testImplementation(libs.mockito.core) testImplementation(libs.mockito.kotlin) testImplementation(libs.kotlin.reflect) testImplementation(project(":formula-test")) diff --git a/samples/todoapp/src/main/AndroidManifest.xml b/samples/todoapp/src/main/AndroidManifest.xml index ed3627a04..849ff885b 100644 --- a/samples/todoapp/src/main/AndroidManifest.xml +++ b/samples/todoapp/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - +