Update the Compose Compiler plugin version checker for beta04
This should have landed with the bump to 1.0.0-beta04
This also aligns androidx.hilt:hilt-navigation-compose
to use the same version of compose and kotlin. Furthermore
it also updates navigation-compose to not pin its dependency
to viewmodel-compose since that will downgrade the runtime
on Android Test variants due to AGP constrains.
Bug: 183511654
Test: gw bOS
Test: gw :hilt:hilt-navigation-compose:compileReleaseKotlin
Test: gw :navigation:navigation-compose:compileDebugAndroidTestKotlin
Change-Id: I8e79af3f1a27d0c2adaa3ad80e1666be8ded2027
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt
index 60f9b8e..d030480 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt
@@ -38,19 +38,20 @@
2200 to "1.0.0-alpha11",
2300 to "1.0.0-alpha12",
2400 to "1.0.0-alpha13",
+ 2500 to "1.0.0-beta04",
)
/**
* The minimum version int that this compiler is guaranteed to be compatible with. Typically
* this will match the version int that is in ComposeVersion.kt in the runtime.
*/
- private val minimumRuntimeVersionInt: Int = 2400
+ private val minimumRuntimeVersionInt: Int = 2500
/**
* The maven version string of this compiler. This string should be updated before/after every
* release.
*/
- val compilerVersion: String = "1.0.0-alpha13"
+ val compilerVersion: String = "1.0.0-beta04"
private val minimumRuntimeVersion: String
get() = versionTable[minimumRuntimeVersionInt] ?: "unknown"
}
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/ComposeVersion.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/ComposeVersion.kt
index 71574bd..252429f 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/ComposeVersion.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/ComposeVersion.kt
@@ -28,5 +28,5 @@
* IMPORTANT: Whenever updating this value, please make sure to also update `versionTable` and
* `minimumRuntimeVersionInt` in `VersionChecker.kt` of the compiler.
*/
- const val version: Int = 2400
+ const val version: Int = 2500
}
diff --git a/hilt/hilt-navigation-compose/build.gradle b/hilt/hilt-navigation-compose/build.gradle
index cf35721..afc8ac0 100644
--- a/hilt/hilt-navigation-compose/build.gradle
+++ b/hilt/hilt-navigation-compose/build.gradle
@@ -42,10 +42,10 @@
implementation(KOTLIN_STDLIB)
api(project(":hilt:hilt-navigation"))
- api("androidx.compose.runtime:runtime:1.0.0-beta01")
- api("androidx.compose.ui:ui:1.0.0-beta01")
- api("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02")
- api("androidx.navigation:navigation-compose:1.0.0-alpha08")
+ api(projectOrArtifact(":compose:runtime:runtime"))
+ api(projectOrArtifact(":compose:ui:ui"))
+ api(projectOrArtifact(":lifecycle:lifecycle-viewmodel-compose"))
+ api(projectOrArtifact(":navigation:navigation-compose"))
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
@@ -69,9 +69,3 @@
runApiTasks = new RunApiTasks.Yes()
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index eca2833..99873f8 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -37,7 +37,7 @@
api(projectOrArtifact(":compose:runtime:runtime"))
api(projectOrArtifact(":compose:runtime:runtime-saveable"))
api(projectOrArtifact(":compose:ui:ui"))
- api("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03")
+ api(projectOrArtifact(":lifecycle:lifecycle-viewmodel-compose"))
api(projectOrArtifact(":navigation:navigation-runtime-ktx"))
androidTestImplementation(projectOrArtifact(":compose:material:material"))
