[go: nahoru, domu]

Merge "Updating Health-Connect library version" into androidx-main
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 0b1b031..d85520f 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
@@ -92,7 +92,7 @@
             8300 to "1.3.0-beta01",
             8400 to "1.3.0-beta02",
             8500 to "1.3.0-beta03",
-            8600 to "1.3.0-beta04",
+            8600 to "1.3.0-rc01",
         )
 
         /**
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index c26b7d4..cfd04cb 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -46,7 +46,7 @@
         api(project(":compose:ui:ui-graphics"))
         api(project(":compose:ui:ui-text"))
         api(project(":compose:ui:ui-unit"))
-        api("androidx.annotation:annotation:1.5.0-beta01")
+        api("androidx.annotation:annotation:1.5.0")
 
         // This has stub APIs for access to legacy Android APIs, so we don't want
         // any dependency on this module.
@@ -148,7 +148,7 @@
                 // This has stub APIs for access to legacy Android APIs, so we don't want
                 // any dependency on this module.
                 compileOnly(project(":compose:ui:ui-android-stubs"))
-                api("androidx.annotation:annotation:1.5.0-beta01")
+                api("androidx.annotation:annotation:1.5.0")
                 implementation("androidx.autofill:autofill:1.0.0")
                 implementation(libs.kotlinCoroutinesAndroid)
 
diff --git a/libraryversions.toml b/libraryversions.toml
index e664750..8b29b53 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -18,9 +18,9 @@
 CARDVIEW = "1.1.0-alpha01"
 CAR_APP = "1.3.0-beta02"
 COLLECTION = "1.3.0-dev01"
-COMPOSE = "1.3.0-beta04"
+COMPOSE = "1.3.0-rc01"
 COMPOSE_COMPILER = "1.3.2"
-COMPOSE_MATERIAL3 = "1.0.0-beta04"
+COMPOSE_MATERIAL3 = "1.0.0-rc01"
 COMPOSE_RUNTIME_TRACING = "1.0.0-alpha01"
 CONSTRAINTLAYOUT_COMPOSE = "1.1.0-alpha01"
 CONSTRAINTLAYOUT = "2.2.0-alpha01"