Merge pull request android#296 from googlecodelabs/jv/basics-m3-bom

Update Compose Basics version

Author: JolandaVerhoef

BasicsCodelab/app/build.gradle

@@ -59,17 +59,21 @@ android {
 }
 
 dependencies {
+ def composeBom = platform('androidx.compose:compose-bom:2022.10.00')
+ implementation(composeBom)
+ androidTestImplementation(composeBom)
+
  implementation 'androidx.core:core-ktx:1.7.0'
  implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
  implementation 'androidx.activity:activity-compose:1.5.1'
- implementation "androidx.compose.ui:ui:$compose_version"
- implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
- implementation 'androidx.compose.material3:material3:1.0.0-SNAPSHOT'
- implementation "androidx.compose.material:material-icons-extended:$compose_version"
+ implementation "androidx.compose.ui:ui"
+ implementation "androidx.compose.ui:ui-tooling-preview"
+ implementation 'androidx.compose.material3:material3'
+ implementation "androidx.compose.material:material-icons-extended"
  testImplementation 'junit:junit:4.13.2'
  androidTestImplementation 'androidx.test.ext:junit:1.1.3'
  androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
- androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
- debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
- debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
+ androidTestImplementation "androidx.compose.ui:ui-test-junit4"
+ debugImplementation "androidx.compose.ui:ui-tooling"
+ debugImplementation "androidx.compose.ui:ui-test-manifest"
 }

BasicsCodelab/build.gradle

@@ -15,11 +15,6 @@
  */
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- ext {
- compose_version = '1.3.0-SNAPSHOT'
- }
-}// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
  id 'com.android.application' version '7.3.0' apply false
  id 'com.android.library' version '7.3.0' apply false

BasicsCodelab/settings.gradle

@@ -25,7 +25,6 @@ dependencyResolutionManagement {
  repositories {
  google()
  mavenCentral()
- maven { url "https://androidx.dev/snapshots/builds/9153353/artifacts/repository/" }
  }
 }
 rootProject.name = "BasicsCodelab"