diff --git a/formula-android-compose/build.gradle.kts b/formula-android-compose/build.gradle.kts index f0877f39..8ca4fae3 100644 --- a/formula-android-compose/build.gradle.kts +++ b/formula-android-compose/build.gradle.kts @@ -16,7 +16,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = libs.versions.compose.get() + kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() } publishing { diff --git a/formula/src/test/java/com/instacart/formula/FormulaRuntimeTest.kt b/formula/src/test/java/com/instacart/formula/FormulaRuntimeTest.kt index ae5b7b4f..16b8ea9b 100644 --- a/formula/src/test/java/com/instacart/formula/FormulaRuntimeTest.kt +++ b/formula/src/test/java/com/instacart/formula/FormulaRuntimeTest.kt @@ -646,7 +646,7 @@ class FormulaRuntimeTest(val runtime: TestableRuntime, val name: String) { } val observer = runtime.test(formula, Unit) - bgAction.latch.await(10, TimeUnit.MILLISECONDS) + bgAction.latch.await(50, TimeUnit.MILLISECONDS) assertThat(bgAction.errors.values().firstOrNull()?.message).contains( "com.instacart.formula.subjects.OnlyUpdateFormula - Only thread that created it can post transition result Expected:" ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 72ec223e..b45efb7d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,9 @@ dokka-gradle = "1.9.10" kotlin = "1.9.10" coroutines = "1.5.2" -compose = "1.5.3" +compose = "1.4.3" +# We keep compiler version separate to support Kotlin updates +compose-compiler = "1.5.3" androidX = "1.2.0" lifecycle = "2.2.0" diff --git a/samples/stopwatch-compose/build.gradle.kts b/samples/stopwatch-compose/build.gradle.kts index f49e3ab5..fca2d135 100644 --- a/samples/stopwatch-compose/build.gradle.kts +++ b/samples/stopwatch-compose/build.gradle.kts @@ -19,7 +19,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = libs.versions.compose.get() + kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() } buildTypes {