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 15687b225..ebc9d592c 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -63,7 +63,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { @@ -106,10 +106,10 @@ dependencies { implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.activity:activity-compose:1.8.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0" implementation 'androidx.navigation:navigation-compose:2.7.6' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index db0da4f64..6d68c3291 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } 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 67e3f79dc..18293f9f2 100644 --- a/AdaptiveUiCodelab/app/build.gradle +++ b/AdaptiveUiCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { resources { @@ -76,13 +76,13 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling" debugImplementation "androidx.compose.ui:ui-test-manifest" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0" implementation 'androidx.activity:activity-compose:1.8.2' implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.window:window:1.2.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" - implementation "androidx.compose.material3:material3-window-size-class:1.2.0-beta01" + implementation "androidx.compose.material3:material3-window-size-class:1.2.0-beta02" testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 8d6c7540f..a8bc9970c 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -84,7 +84,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { @@ -123,7 +123,7 @@ dependencies { debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.6.2" + def lifecycle_version = "2.7.0" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index d1579082e..cf9513097 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 431d2a4ed..288969397 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { resources { @@ -74,7 +74,7 @@ dependencies { implementation "androidx.compose.material:material-icons-extended" implementation "androidx.compose.ui:ui-tooling-preview" implementation "com.google.android.material:material:1.11.0" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' implementation 'androidx.activity:activity-compose:1.8.2' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index cb898a557..1c547392a 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -25,7 +25,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 5e7fd8493..d0152d525 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -50,7 +50,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { // Multiple dependency bring these files in. Exclude them to enable @@ -71,8 +71,8 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation "androidx.core:core-ktx:1.12.0" implementation "androidx.fragment:fragment-ktx:1.6.2" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0" implementation "androidx.navigation:navigation-fragment-ktx:2.7.6" implementation "androidx.navigation:navigation-ui-ktx:2.7.6" implementation "androidx.recyclerview:recyclerview:1.3.2" @@ -104,7 +104,7 @@ dependencies { androidTestImplementation "androidx.test.ext:junit:1.1.5" androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0" androidTestImplementation "androidx.work:work-testing:2.9.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 7f3774f6b..cf17c1a2b 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -28,7 +28,7 @@ buildscript { } 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 330cd5762..8cb007fe4 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -69,7 +69,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 34a23caa2..afaf686f5 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects { diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index c7b9eadf4..4a2547061 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -25,7 +25,7 @@ buildscript { // App dependencies appCompatVersion = '1.6.1' activityComposeVersion = '1.8.2' - composeCompilerVersion = '1.5.7' + composeCompilerVersion = '1.5.8' coreTestingVersion = '2.2.0' coroutinesVersion = "1.5.2" espressoVersion = '3.5.1' @@ -55,7 +55,7 @@ buildscript { } 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 e7d1f0c3f..2f202e244 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { @@ -117,11 +117,11 @@ dependencies { implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.activity:activity-compose:1.8.2" - implementation "androidx.lifecycle:lifecycle-runtime-compose:2.6.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2" + implementation "androidx.lifecycle:lifecycle-runtime-compose:2.7.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0" androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation 'androidx.test:runner:1.5.2' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 81c205e20..da7356b99 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.23.3' + id 'com.diffplug.spotless' version '6.25.0' } subprojects {