diff --git a/.github/workflows/AccessibilityCodelab.yaml b/.github/workflows/AccessibilityCodelab.yaml index 09d373fa3..d473adcac 100644 --- a/.github/workflows/AccessibilityCodelab.yaml +++ b/.github/workflows/AccessibilityCodelab.yaml @@ -35,7 +35,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index defe0f0e3..89679f98f 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -35,7 +35,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* @@ -48,14 +48,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports @@ -84,7 +84,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* @@ -104,7 +104,7 @@ jobs: - name: Upload test reports if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/AnimationCodelab.yaml b/.github/workflows/AnimationCodelab.yaml index 6a1e72733..8de6de50b 100644 --- a/.github/workflows/AnimationCodelab.yaml +++ b/.github/workflows/AnimationCodelab.yaml @@ -34,7 +34,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* diff --git a/.github/workflows/BasicLayoutsCodelab.yaml b/.github/workflows/BasicLayoutsCodelab.yaml index 2110d8592..ae8476c44 100644 --- a/.github/workflows/BasicLayoutsCodelab.yaml +++ b/.github/workflows/BasicLayoutsCodelab.yaml @@ -34,7 +34,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* diff --git a/.github/workflows/BasicStateCodelab.yaml b/.github/workflows/BasicStateCodelab.yaml index 4b564256b..5215c004d 100644 --- a/.github/workflows/BasicStateCodelab.yaml +++ b/.github/workflows/BasicStateCodelab.yaml @@ -34,7 +34,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* diff --git a/.github/workflows/BasicsCodelab.yaml b/.github/workflows/BasicsCodelab.yaml index 9357863ae..5f56e7453 100644 --- a/.github/workflows/BasicsCodelab.yaml +++ b/.github/workflows/BasicsCodelab.yaml @@ -34,7 +34,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* diff --git a/.github/workflows/MigrationCodelab.yaml b/.github/workflows/MigrationCodelab.yaml index 4548b384f..e216f8392 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -35,7 +35,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* @@ -48,14 +48,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports @@ -84,7 +84,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* @@ -104,7 +104,7 @@ jobs: - name: Upload test reports if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/NavigationCodelab.yaml b/.github/workflows/NavigationCodelab.yaml index 7e319d2a3..e28094bb1 100644 --- a/.github/workflows/NavigationCodelab.yaml +++ b/.github/workflows/NavigationCodelab.yaml @@ -35,7 +35,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* diff --git a/.github/workflows/TestingCodelab.yaml b/.github/workflows/TestingCodelab.yaml index e4a41e109..3b8871663 100644 --- a/.github/workflows/TestingCodelab.yaml +++ b/.github/workflows/TestingCodelab.yaml @@ -35,7 +35,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* diff --git a/.github/workflows/ThemingCodelab.yaml b/.github/workflows/ThemingCodelab.yaml index 07097c9d4..d77f4034f 100644 --- a/.github/workflows/ThemingCodelab.yaml +++ b/.github/workflows/ThemingCodelab.yaml @@ -34,7 +34,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index e44132af6..a1a140f7a 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index d84331708..0af99b325 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath 'com.android.tools.build:gradle:8.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/AdaptiveUICodelab/app/build.gradle b/AdaptiveUICodelab/app/build.gradle index 67571cf3e..630459129 100644 --- a/AdaptiveUICodelab/app/build.gradle +++ b/AdaptiveUICodelab/app/build.gradle @@ -65,7 +65,7 @@ android { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle index 93a5b98f0..f996e7f0b 100644 --- a/AdaptiveUICodelab/build.gradle +++ b/AdaptiveUICodelab/build.gradle @@ -19,7 +19,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.2.1" + classpath "com.android.tools.build:gradle:8.2.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 84a009dad..c57796870 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -109,7 +109,7 @@ dependencies { implementation "androidx.activity:activity-compose:1.8.2" implementation "androidx.appcompat:appcompat:1.6.1" - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 9359a02d0..d91b5a2c0 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.2.1" + classpath "com.android.tools.build:gradle:8.2.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" classpath "com.google.dagger:hilt-android-gradle-plugin:2.50" } } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 57073b0b6..f301cc2a5 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath 'com.android.tools.build:gradle:8.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index 06b100e0d..57e69343c 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.8.2' diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index 06b100e0d..57e69343c 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.8.2' diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index e04088d79..872daf7f4 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 60941e05d..ec4b58ecb 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,13 +20,13 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.2.1" + classpath "com.android.tools.build:gradle:8.2.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index 10bbe88c4..847667254 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -70,7 +70,7 @@ dependencies { implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0") implementation("androidx.activity:activity-compose:1.8.2") - implementation(platform("androidx.compose:compose-bom:2023.10.01")) + implementation(platform("androidx.compose:compose-bom:2024.01.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -78,7 +78,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.01.00")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index fc25c17fe..0f36d4e8a 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,13 +20,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath 'com.android.tools.build:gradle:8.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index b465aa406..1f98e8521 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -69,7 +69,7 @@ dependencies { implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") implementation("androidx.activity:activity-compose:1.8.2") - implementation(platform("androidx.compose:compose-bom:2023.10.01")) + implementation(platform("androidx.compose:compose-bom:2024.01.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -78,7 +78,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.01.00")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index d8eb0027e..9a745d86c 100644 --- a/BasicsCodelab/build.gradle.kts +++ b/BasicsCodelab/build.gradle.kts @@ -16,6 +16,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false + id("com.android.application") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "1.9.22" apply false } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 58a29de81..c99131ca2 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -61,7 +61,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -105,7 +105,7 @@ dependencies { androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0" androidTestImplementation "androidx.work:work-testing:2.9.0" androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.0" - androidTestImplementation "com.google.truth:truth:1.2.0" + androidTestImplementation "com.google.truth:truth:1.3.0" androidTestImplementation "androidx.compose.ui:ui-test-junit4" testImplementation "junit:junit:4.13.2" } \ No newline at end of file diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index b4325a247..5786fd63b 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.2.1" + classpath "com.android.tools.build:gradle:8.2.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.6" } } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } allprojects { diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index aed79e461..4529b8de6 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/NavigationCodelab/app/src/main/java/com/example/compose/rally/ui/overview/OverviewScreen.kt b/NavigationCodelab/app/src/main/java/com/example/compose/rally/ui/overview/OverviewScreen.kt index 207aec192..4c02ce01f 100644 --- a/NavigationCodelab/app/src/main/java/com/example/compose/rally/ui/overview/OverviewScreen.kt +++ b/NavigationCodelab/app/src/main/java/com/example/compose/rally/ui/overview/OverviewScreen.kt @@ -35,7 +35,7 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.material.TextButton import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Sort +import androidx.compose.material.icons.automirrored.filled.Sort import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -162,7 +162,7 @@ private fun AlertItem(message: String) { .align(Alignment.Top) .clearAndSetSemantics {} ) { - Icon(Icons.Filled.Sort, contentDescription = null) + Icon(Icons.AutoMirrored.Filled.Sort, contentDescription = null) } } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 3a3e0477c..c891a35e6 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.2.1" + classpath "com.android.tools.build:gradle:8.2.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 12890dc74..5dd85bd0d 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/app/src/main/java/com/example/compose/rally/ui/overview/OverviewBody.kt b/TestingCodelab/app/src/main/java/com/example/compose/rally/ui/overview/OverviewBody.kt index f1bbc9df2..ccf3cdc02 100644 --- a/TestingCodelab/app/src/main/java/com/example/compose/rally/ui/overview/OverviewBody.kt +++ b/TestingCodelab/app/src/main/java/com/example/compose/rally/ui/overview/OverviewBody.kt @@ -36,7 +36,7 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.material.TextButton import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Sort +import androidx.compose.material.icons.automirrored.filled.Sort import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -181,7 +181,7 @@ private fun AlertItem(message: String) { .align(Alignment.Top) .clearAndSetSemantics {} ) { - Icon(Icons.Filled.Sort, contentDescription = null) + Icon(Icons.AutoMirrored.Filled.Sort, contentDescription = null) } } } diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index dec718b2c..8575d4eb1 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.2.1" + classpath "com.android.tools.build:gradle:8.2.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 8bec1e639..17e2c5e9c 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 93f159953..499dd914f 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath 'com.android.tools.build:gradle:8.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 621a55b08..f1e609ca6 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -46,7 +46,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.01.00') implementation(composeBom) implementation 'androidx.core:core-ktx:1.12.0' diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index e440cb408..5fdfa0d7b 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.2.1" + classpath "com.android.tools.build:gradle:8.2.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } }