From df62d9e761d55c11e73e0575ede6990db3020278 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 18:46:47 +0000 Subject: [PATCH 1/7] Update all dependencies --- AccessibilityCodelab/app/build.gradle | 4 ++-- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUiCodelab/app/build.gradle | 4 ++-- AdaptiveUiCodelab/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/build.gradle | 2 +- BasicLayoutsCodelab/app/build.gradle | 4 ++-- BasicLayoutsCodelab/build.gradle | 2 +- MigrationCodelab/app/build.gradle | 6 +++--- MigrationCodelab/build.gradle | 2 +- NavigationCodelab/app/build.gradle | 4 ++-- NavigationCodelab/build.gradle | 2 +- TestingCodelab/app/build.gradle | 2 +- TestingCodelab/build.gradle | 6 +++--- ThemingCodelab/app/build.gradle | 4 ++-- ThemingCodelab/build.gradle | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index f5d336787..5a1e9426f 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -73,7 +73,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -103,7 +103,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.activity:activity-ktx:1.9.0' - implementation 'androidx.core:core-ktx:1.13.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" diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 1beb63038..674e2fb76 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' + classpath 'com.android.tools.build:gradle:8.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle index b2f50bfaa..14807fc1e 100644 --- a/AdaptiveUiCodelab/app/build.gradle +++ b/AdaptiveUiCodelab/app/build.gradle @@ -65,7 +65,7 @@ android { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -79,7 +79,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0" implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0" implementation 'androidx.activity:activity-compose:1.9.0' - implementation 'androidx.core:core-ktx:1.13.0' + implementation 'androidx.core:core-ktx:1.13.1' implementation "androidx.window:window:1.2.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0" implementation "androidx.compose.material3:material3-window-size-class:1.2.1" diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle index 22c813ec1..503b48f4a 100644 --- a/AdaptiveUiCodelab/build.gradle +++ b/AdaptiveUiCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" + classpath "com.android.tools.build:gradle:8.4.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 5f4f1beb3..017673bd6 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -109,7 +109,7 @@ dependencies { implementation "androidx.activity:activity-compose:1.9.0" implementation "androidx.appcompat:appcompat:1.6.1" - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 05700870c..2734728e0 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" + classpath "com.android.tools.build:gradle:8.4.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1" } diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index f988aca35..25f676a37 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -63,11 +63,11 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) androidTestImplementation(composeBom) - implementation 'androidx.core:core-ktx:1.13.0' + implementation 'androidx.core:core-ktx:1.13.1' implementation "androidx.compose.ui:ui" implementation 'androidx.compose.material3:material3' implementation 'androidx.compose.material3:material3-window-size-class:1.2.1' diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 58fb0a510..b73fa7959 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -19,7 +19,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" + classpath "com.android.tools.build:gradle:8.4.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 98330dd0b..a0d36e5c7 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -61,7 +61,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -69,8 +69,8 @@ dependencies { kapt "com.github.bumptech.glide:compiler:4.16.0" implementation "androidx.appcompat:appcompat:1.6.1" implementation "androidx.constraintlayout:constraintlayout:2.1.4" - implementation "androidx.core:core-ktx:1.13.0" - implementation "androidx.fragment:fragment-ktx:1.6.2" + 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.navigation:navigation-fragment-ktx:2.7.7" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index f35705445..f99579ab3 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" + classpath "com.android.tools.build:gradle:8.4.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7" } diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 7ad51d0da..8717af9b7 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -80,12 +80,12 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.6.1" - implementation "androidx.core:core-ktx:1.13.0" + implementation "androidx.core:core-ktx:1.13.1" implementation "com.google.android.material:material:1.11.0" // Compose diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 049e9ef19..521eae080 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" + classpath "com.android.tools.build:gradle:8.4.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index ddc0f6494..d69ac3ccc 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 8b79a7ba2..dddfcd92d 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -29,11 +29,11 @@ buildscript { coreTestingVersion = '2.2.0' coroutinesVersion = "1.5.2" espressoVersion = '3.5.1' - fragmentVersion = '1.6.2' + fragmentVersion = '1.7.0' junitVersion = '4.13.1' kotlinVersion = '1.9.22' ktlintVersion = '0.48.2' - ktxVersion = '1.13.0' + ktxVersion = '1.13.1' lifecycleVersion = '2.3.0' materialVersion = '1.11.0' runnerVersion = '1.0.1' @@ -49,7 +49,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" + classpath "com.android.tools.build:gradle:8.4.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index b94afc2d8..3b97c067d 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -114,7 +114,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.activity:activity-ktx:1.9.0' - implementation 'androidx.core:core-ktx:1.13.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" diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 7274301ac..be0b56464 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' + classpath 'com.android.tools.build:gradle:8.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } From 68881b68506e79c94084ba4e4ba973d94ddb19aa Mon Sep 17 00:00:00 2001 From: Simona Milanovic Date: Thu, 2 May 2024 11:12:30 +0100 Subject: [PATCH 2/7] Update deps and fix emulator runners for instrumentation tests --- .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml | 2 +- .github/workflows/MigrationCodelab.yaml | 2 +- AccessibilityCodelab/app/build.gradle | 2 +- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUiCodelab/app/build.gradle | 2 +- AdaptiveUiCodelab/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/build.gradle | 2 +- BasicLayoutsCodelab/app/build.gradle | 2 +- BasicLayoutsCodelab/build.gradle | 2 +- MigrationCodelab/app/build.gradle | 2 +- MigrationCodelab/build.gradle | 2 +- NavigationCodelab/app/build.gradle | 2 +- NavigationCodelab/build.gradle | 2 +- ThemingCodelab/app/build.gradle | 2 +- ThemingCodelab/build.gradle | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 5cb559eb4..62680f687 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -62,7 +62,7 @@ jobs: test: needs: build - runs-on: macos-latest # enables hardware acceleration in the virtual machine + runs-on: ubuntu-latest timeout-minutes: 30 strategy: matrix: diff --git a/.github/workflows/MigrationCodelab.yaml b/.github/workflows/MigrationCodelab.yaml index f14e358ab..77265cb6c 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -62,7 +62,7 @@ jobs: test: needs: build - runs-on: macos-latest # enables hardware acceleration in the virtual machine + runs-on: ubuntu-latest timeout-minutes: 30 strategy: matrix: diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 5a1e9426f..6fceaadcb 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -63,7 +63,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } packagingOptions { diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 674e2fb76..5ea0dc4c2 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.4.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle index 14807fc1e..04e57c1b6 100644 --- a/AdaptiveUiCodelab/app/build.gradle +++ b/AdaptiveUiCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } packagingOptions { resources { diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle index 503b48f4a..e89535a96 100644 --- a/AdaptiveUiCodelab/build.gradle +++ b/AdaptiveUiCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 017673bd6..00f6e41ec 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -84,7 +84,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } packagingOptions { diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 2734728e0..7f99d5437 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1" } } diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 25f676a37..ff82ee316 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } packagingOptions { resources { diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index b73fa7959..de991fe92 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index a0d36e5c7..e6d5ef9c0 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -50,7 +50,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } packagingOptions { // Multiple dependency bring these files in. Exclude them to enable diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index f99579ab3..b0fe6821d 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7" } } diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 8717af9b7..1b3515b27 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -69,7 +69,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } packagingOptions { diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 521eae080..3448112a2 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 3b97c067d..2a6793d24 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } packagingOptions { diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index be0b56464..e634673ec 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.4.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } From 6be23431df4b75a0a4a022e7047c5bea15fc0ddf Mon Sep 17 00:00:00 2001 From: Simona Milanovic Date: Thu, 2 May 2024 11:19:17 +0100 Subject: [PATCH 3/7] Update deps --- AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties | 2 +- AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties | 2 +- MigrationCodelab/gradle/wrapper/gradle-wrapper.properties | 2 +- NavigationCodelab/gradle/wrapper/gradle-wrapper.properties | 2 +- TestingCodelab/build.gradle | 4 ++-- TestingCodelab/gradle/wrapper/gradle-wrapper.properties | 2 +- ThemingCodelab/gradle/wrapper/gradle-wrapper.properties | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index dddfcd92d..18987087a 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -25,13 +25,13 @@ buildscript { // App dependencies appCompatVersion = '1.6.1' activityComposeVersion = '1.9.0' - composeCompilerVersion = '1.5.10' + composeCompilerVersion = '1.5.13' coreTestingVersion = '2.2.0' coroutinesVersion = "1.5.2" espressoVersion = '3.5.1' fragmentVersion = '1.7.0' junitVersion = '4.13.1' - kotlinVersion = '1.9.22' + kotlinVersion = '1.9.23' ktlintVersion = '0.48.2' ktxVersion = '1.13.1' lifecycleVersion = '2.3.0' diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From a905824bb929fed7626c8b76f3cb71b87c33426d Mon Sep 17 00:00:00 2001 From: Simona Milanovic Date: Thu, 2 May 2024 11:46:08 +0100 Subject: [PATCH 4/7] Fix emulator failing --- .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml | 4 +--- .github/workflows/MigrationCodelab.yaml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 62680f687..44ca89334 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - - end paths: - 'AdvancedStateAndSideEffectsCodelab/**' pull_request: @@ -96,7 +95,6 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: api-level: ${{ matrix.api-level }} - target: google_apis arch: x86 disable-animations: true script: ./gradlew connectedCheck --stacktrace @@ -106,5 +104,5 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: test-reports-${{ matrix.api-level }} + name: test-reports-state-${{ matrix.api-level }} path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/MigrationCodelab.yaml b/.github/workflows/MigrationCodelab.yaml index 77265cb6c..9f6b752b3 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - - end paths: - 'MigrationCodelab/**' pull_request: @@ -96,7 +95,6 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: api-level: ${{ matrix.api-level }} - target: google_apis arch: x86 disable-animations: true script: ./gradlew connectedCheck --stacktrace @@ -106,5 +104,5 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: test-reports-${{ matrix.api-level }} + name: test-reports-migration-${{ matrix.api-level }} path: ${{ env.SAMPLE_PATH }}/app/build/reports From 60c6fca557e1d49fa5d0cb6eae2170d624ea8b58 Mon Sep 17 00:00:00 2001 From: Simona Milanovic Date: Thu, 2 May 2024 14:08:29 +0100 Subject: [PATCH 5/7] Fix UI tests running on CI and emulator issues --- .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml | 4 ++-- .github/workflows/MigrationCodelab.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 44ca89334..8aa8394f6 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -61,11 +61,11 @@ jobs: test: needs: build - runs-on: ubuntu-latest + runs-on: macos-13 timeout-minutes: 30 strategy: matrix: - api-level: [23, 26, 29] + api-level: [26, 29] steps: - name: Checkout diff --git a/.github/workflows/MigrationCodelab.yaml b/.github/workflows/MigrationCodelab.yaml index 9f6b752b3..a8ed0f395 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -65,7 +65,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - api-level: [23, 26, 29] + api-level: [26, 29] steps: - name: Checkout From 01c4a07afea72355c63babd3cd288455bc2538d2 Mon Sep 17 00:00:00 2001 From: Simona Milanovic Date: Thu, 2 May 2024 15:40:12 +0100 Subject: [PATCH 6/7] Fix UI tests running on CI and emulator issues --- .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 8aa8394f6..192de0cbf 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-latest timeout-minutes: 30 strategy: matrix: From 236efc466ba11c772998219c24cde7fe202e48ce Mon Sep 17 00:00:00 2001 From: Simona Milanovic Date: Thu, 2 May 2024 15:44:04 +0100 Subject: [PATCH 7/7] Fix UI tests running on CI and emulator issues --- .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 192de0cbf..d8d89ce64 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -61,7 +61,7 @@ jobs: test: needs: build - runs-on: macos-latest + runs-on: macos-13 timeout-minutes: 30 strategy: matrix: @@ -95,6 +95,7 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: api-level: ${{ matrix.api-level }} + target: google_apis arch: x86 disable-animations: true script: ./gradlew connectedCheck --stacktrace