Merge pull request #1182 from kul3r4/update1.4

Update to Compose 1.4
android · Sep 6, 2024 · 81c6e33 · 81c6e33
2 parents 77ab745 + 77032e3
commit 81c6e33
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/ComposeStarter/gradle/libs.versions.toml b/ComposeStarter/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 android-gradle-plugin = "8.6.0"
 androidx-activity = "1.9.1"
 androidx-compose-bom = "2024.08.00"
-androidx-wear-compose = "1.3.1"
+androidx-wear-compose = "1.4.0"
 compose-compiler = "1.5.15"
 compose-ui-tooling = "1.3.1"
 horologist = "0.5.28"

diff --git a/DataLayer/gradle/libs.versions.toml b/DataLayer/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ androidx-activity = "1.9.1"
 androidx-compose-bom = "2024.08.00"
 # do not bump to 2.8.0 until bumping to beta version of Compose
 androidx-lifecycle = "2.8.4"
-androidx-wear-compose = "1.3.1"
+androidx-wear-compose = "1.4.0"
 compose-compiler = "1.5.15"
 ktlint = "0.50.0"
 org-jetbrains-kotlin = "1.9.25"

diff --git a/WearOAuth/gradle/libs.versions.toml b/WearOAuth/gradle/libs.versions.toml
@@ -4,13 +4,12 @@ androidx-compose-bom = "2024.08.00"
 androidx-activity = "1.9.1"
 androidx-lifecycle = "2.8.4"
 androidx-test = "1.5.2"
-androidx-wear-compose = "1.4.0-rc01"
+androidx-wear-compose = "1.4.0"
 compose = "1.7.0-rc01"
 compose-compiler = "1.5.15"
 org-jetbrains-kotlin = "1.9.25"
 org-jetbrains-kotlinx = "1.8.1"
 ktlint = "0.50.0"
-compose-material3 = "1.0.0-alpha23"
 horologist = "0.6.12"
 robolectric = "4.13"
 roborazzi = "1.26.0"
@@ -67,7 +66,6 @@ wear-compose-material = { module = "androidx.wear.compose:compose-material", ver
 wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "androidx-wear-compose" }
 wear-phone-interactions = "androidx.wear:wear-phone-interactions:1.1.0-alpha04"
 wear-remote-interactions = "androidx.wear:wear-remote-interactions:1.0.0"
-androidx-compose-material3 = { group = "androidx.wear.compose", name = "compose-material3", version.ref = "compose-material3" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
 roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
 roborazzi-compose = { group = "io.github.takahirom.roborazzi", name = "roborazzi-compose", version.ref = "roborazzi" }

diff --git a/WearSpeakerSample/gradle/libs.versions.toml b/WearSpeakerSample/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ androidx-activity = "1.9.1"
 androidx-compose-bom = "2024.08.00"
 androidx-lifecycle = "2.7.0"
 androidx-media3 = "1.4.1"
-androidx-wear-compose = "1.3.1"
+androidx-wear-compose = "1.4.0"
 compose-compiler = "1.5.15"
 compose-ui-tooling = "1.3.1"
 ktlint = "0.50.0"
@@ -15,7 +15,6 @@ ui-test-junit4 = "1.6.8"
 ui-test-manifest = "1.6.8"
 horologist = "0.5.28"
 androidx-constraintlayout-compose = "1.0.1"
-material3-android = "1.2.1"
 kotlinxCoroutine = "1.8.1"
 
 [libraries]
@@ -53,7 +52,6 @@ wear-compose-material = { module = "androidx.wear.compose:compose-material", ver
 wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "androidx-wear-compose" }
 androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout-compose" }
 compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
-androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3-android" }
 androidx-media3-common = { module = "androidx.media3:media3-common", version.ref = "androidx-media3" }
 androidx-media3-datasourceokhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "androidx-media3" }
 androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "androidx-media3" }