From 3e7ac1acf7b3838c0dbcd3ad55d5464588da4fca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 09:46:30 +0000 Subject: [PATCH 1/2] Update all dependencies --- .../AdvancedStateAndSideEffectsCodelab.yaml | 2 +- AccessibilityCodelab/app/build.gradle | 16 ++++++++-------- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUiCodelab/app/build.gradle | 8 ++++---- AdaptiveUiCodelab/build.gradle | 2 +- .../app/build.gradle | 6 +++--- AdvancedStateAndSideEffectsCodelab/build.gradle | 2 +- BasicLayoutsCodelab/app/build.gradle | 6 +++--- BasicLayoutsCodelab/build.gradle | 2 +- MigrationCodelab/app/build.gradle | 16 ++++++++-------- MigrationCodelab/build.gradle | 2 +- NavigationCodelab/app/build.gradle | 6 +++--- NavigationCodelab/build.gradle | 2 +- PerformanceCodelab/gradle/libs.versions.toml | 12 ++++++------ TestingCodelab/app/build.gradle | 2 +- TestingCodelab/build.gradle | 8 ++++---- ThemingCodelab/app/build.gradle | 14 +++++++------- ThemingCodelab/build.gradle | 2 +- 18 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index d8d89ce64..8a8713385 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -61,7 +61,7 @@ jobs: test: needs: build - runs-on: macos-13 + runs-on: macos-14 timeout-minutes: 30 strategy: matrix: diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 70f35ad55..247298d9d 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -70,7 +70,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.05.00') + def composeBom = platform('androidx.compose:compose-bom:2024.06.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -94,19 +94,19 @@ dependencies { implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version" implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version" - implementation "com.google.android.material:material:1.11.0" + implementation "com.google.android.material:material:1.12.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.9.0' implementation 'androidx.core:core-ktx:1.13.1' implementation "androidx.activity:activity-compose:1.9.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" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2" implementation 'androidx.navigation:navigation-compose:2.7.7' @@ -115,7 +115,7 @@ dependencies { // TODO: Bump to latest after Espresso 3.5.0 goes stable // (due to https://github.com/robolectric/robolectric/issues/6593) - testImplementation 'org.robolectric:robolectric:4.12.1' + testImplementation 'org.robolectric:robolectric:4.12.2' } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index c440d7d8c..967a2ac23 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.4.0' + classpath 'com.android.tools.build:gradle:8.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" } } diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle index 8eafbd244..5bdfd1894 100644 --- a/AdaptiveUiCodelab/app/build.gradle +++ b/AdaptiveUiCodelab/app/build.gradle @@ -63,7 +63,7 @@ android { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.05.00') + def composeBom = platform('androidx.compose:compose-bom:2024.06.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -74,11 +74,11 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling" debugImplementation "androidx.compose.ui:ui-test-manifest" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.2" implementation 'androidx.activity:activity-compose:1.9.0' implementation 'androidx.core:core-ktx:1.13.1' - implementation "androidx.window:window:1.2.0" + implementation "androidx.window:window:1.3.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation "androidx.compose.material3:material3-window-size-class:1.2.1" diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle index 3ae3df02b..7ec40ec42 100644 --- a/AdaptiveUiCodelab/build.gradle +++ b/AdaptiveUiCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.4.0" + classpath "com.android.tools.build:gradle:8.5.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index be275d55d..da32b41b1 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -104,9 +104,9 @@ dependencies { } implementation "androidx.activity:activity-compose:1.9.0" - implementation "androidx.appcompat:appcompat:1.6.1" + implementation "androidx.appcompat:appcompat:1.7.0" - def composeBom = platform('androidx.compose:compose-bom:2024.05.00') + def composeBom = platform('androidx.compose:compose-bom:2024.06.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -120,7 +120,7 @@ dependencies { debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.7.0" + def lifecycle_version = "2.8.2" 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 36e3f8371..01d431de9 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.4.0" + classpath "com.android.tools.build:gradle:8.5.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index c7e509733..889661085 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -61,7 +61,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.05.00') + def composeBom = platform('androidx.compose:compose-bom:2024.06.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -71,8 +71,8 @@ dependencies { implementation 'androidx.compose.material3:material3-window-size-class:1.2.1' 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.7.0' + implementation "com.google.android.material:material:1.12.0" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.2' implementation 'androidx.activity:activity-compose:1.9.0' 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 73922b2a2..23b10dd79 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -19,7 +19,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.4.0" + classpath "com.android.tools.build:gradle:8.5.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index ae32d3fa3..9e52ab929 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -60,28 +60,28 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.05.00') + def composeBom = platform('androidx.compose:compose-bom:2024.06.00') implementation(composeBom) androidTestImplementation(composeBom) kapt "androidx.room:room-compiler:2.6.1" kapt "com.github.bumptech.glide:compiler:4.16.0" - implementation "androidx.appcompat:appcompat:1.6.1" + implementation "androidx.appcompat:appcompat:1.7.0" implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation "androidx.core:core-ktx:1.13.1" - implementation "androidx.fragment:fragment-ktx:1.7.0" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0" + implementation "androidx.fragment:fragment-ktx:1.8.0" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2" implementation "androidx.navigation:navigation-fragment-ktx:2.7.7" implementation "androidx.navigation:navigation-ui-ktx:2.7.7" implementation "androidx.recyclerview:recyclerview:1.3.2" implementation "androidx.room:room-runtime:2.6.1" implementation "androidx.room:room-ktx:2.6.1" - implementation "androidx.viewpager2:viewpager2:1.0.0" + implementation "androidx.viewpager2:viewpager2:1.1.0" implementation "androidx.work:work-runtime-ktx:2.9.0" implementation "com.github.bumptech.glide:glide:4.16.0" - implementation "com.google.android.material:material:1.11.0" - implementation "com.google.code.gson:gson:2.10.1" + implementation "com.google.android.material:material:1.12.0" + implementation "com.google.code.gson:gson:2.11.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index bf8bc62d8..f81af428a 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.4.0" + classpath "com.android.tools.build:gradle:8.5.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index b53362bd0..21712a90d 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -81,13 +81,13 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.05.00') + def composeBom = platform('androidx.compose:compose-bom:2024.06.00') implementation(composeBom) androidTestImplementation(composeBom) - implementation "androidx.appcompat:appcompat:1.6.1" + implementation "androidx.appcompat:appcompat:1.7.0" implementation "androidx.core:core-ktx:1.13.1" - implementation "com.google.android.material:material:1.11.0" + implementation "com.google.android.material:material:1.12.0" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index af5e2a1fe..150214b4c 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.4.0" + classpath "com.android.tools.build:gradle:8.5.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 14e7f497e..804c8b2ce 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,19 +1,19 @@ [versions] coil = "2.6.0" -com-android-application = "8.3.2" +com-android-application = "8.5.0" desugar_jdk_libs = "2.0.4" kotlinx-datetime = "0.6.0" -lifecycle-viewmodel-compose = "2.7.0" -material-icons-core = "1.6.6" +lifecycle-viewmodel-compose = "2.8.2" +material-icons-core = "1.6.8" media3 = "1.3.1" org-jetbrains-kotlin-android = "2.0.0" -core-ktx = "1.13.0" +core-ktx = "1.13.1" junit = "4.13.2" androidx-test-ext-junit = "1.1.5" espresso-core = "3.5.1" -lifecycle-runtime-ktx = "2.7.0" +lifecycle-runtime-ktx = "2.8.2" activity-compose = "1.9.0" -compose-bom = "2024.04.01" +compose-bom = "2024.06.00" runtime-tracing = "1.0.0-beta01" tracing-ktx = "1.3.0-alpha02" tracing-perfetto = "1.0.0" diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 28f6d55e8..2c8f67437 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -84,7 +84,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.05.00') + def composeBom = platform('androidx.compose:compose-bom:2024.06.00') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index b5572b7c3..de28bccf5 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -23,18 +23,18 @@ buildscript { targetSdkVersion = 33 // App dependencies - appCompatVersion = '1.6.1' + appCompatVersion = '1.7.0' activityComposeVersion = '1.9.0' coreTestingVersion = '2.2.0' coroutinesVersion = "1.5.2" espressoVersion = '3.5.1' - fragmentVersion = '1.7.0' + fragmentVersion = '1.8.0' junitVersion = '4.13.1' kotlinVersion = '2.0.0' ktlintVersion = '0.48.2' ktxVersion = '1.13.1' lifecycleVersion = '2.3.0' - materialVersion = '1.11.0' + materialVersion = '1.12.0' runnerVersion = '1.0.1' truthVersion = '1.0.1' testExtJunit = '1.1.3' @@ -48,7 +48,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.4.0" + classpath "com.android.tools.build:gradle:8.5.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion" } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 9f4f598f2..e23304460 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.05.00') + def composeBom = platform('androidx.compose:compose-bom:2024.06.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -109,16 +109,16 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.9.0' implementation 'androidx.core:core-ktx:1.13.1' implementation "androidx.activity:activity-compose:1.9.0" - 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" + implementation "androidx.lifecycle:lifecycle-runtime-compose:2.8.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2" 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 68b7d4a94..dacd45f86 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.4.0' + classpath 'com.android.tools.build:gradle:8.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } From ad4b8c4684d1699be2b45fbb794a5598b3eab2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Mon, 17 Jun 2024 09:13:56 +0200 Subject: [PATCH 2/2] Use ubuntu-latest --- .../workflows/AdvancedStateAndSideEffectsCodelab.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 8a8713385..08a98b3ff 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -61,13 +61,21 @@ jobs: test: needs: build - runs-on: macos-14 + runs-on: ubuntu-latest timeout-minutes: 30 strategy: matrix: api-level: [26, 29] steps: + # https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners + - name: Enable KVM group perms + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + ls /dev/kvm + - name: Checkout uses: actions/checkout@v4