diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 5cb559eb4..d8d89ce64 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - - end paths: - 'AdvancedStateAndSideEffectsCodelab/**' pull_request: @@ -62,11 +61,11 @@ jobs: test: needs: build - runs-on: macos-latest # enables hardware acceleration in the virtual machine + runs-on: macos-13 timeout-minutes: 30 strategy: matrix: - api-level: [23, 26, 29] + api-level: [26, 29] steps: - name: Checkout @@ -106,5 +105,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 f14e358ab..a8ed0f395 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - - end paths: - 'MigrationCodelab/**' pull_request: @@ -62,11 +61,11 @@ jobs: test: needs: build - runs-on: macos-latest # enables hardware acceleration in the virtual machine + runs-on: ubuntu-latest timeout-minutes: 30 strategy: matrix: - api-level: [23, 26, 29] + api-level: [26, 29] steps: - name: Checkout @@ -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 diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 3be223315..4deec80ce 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } packagingOptions { @@ -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) @@ -118,7 +118,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 90876129d..3b9cbb049 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath 'com.android.tools.build:gradle:8.4.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } 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/app/build.gradle b/AdaptiveUICodelab/app/build.gradle index 9f6177edc..341626c55 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 { @@ -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" diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle index 8a636a001..ae90a4865 100644 --- a/AdaptiveUICodelab/build.gradle +++ b/AdaptiveUICodelab/build.gradle @@ -19,8 +19,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "com.android.tools.build:gradle:8.4.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } 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/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 01ba4ade3..597322a3c 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 { @@ -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..7f99d5437 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "com.android.tools.build:gradle:8.4.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1" } } 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/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index de41c8ea0..c494ee235 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath 'com.android.tools.build:gradle:8.4.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index 9a6c03482..aa1f895d6 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -40,16 +40,16 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) 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.compose.ui:ui" implementation "androidx.compose.material3:material3" implementation "androidx.compose.ui:ui-tooling-preview" diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AnimationCodelab/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/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index 9a6c03482..aa1f895d6 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -40,16 +40,16 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(composeBom) 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.compose.ui:ui" implementation "androidx.compose.material3:material3" implementation "androidx.compose.ui:ui-tooling-preview" diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 9a2cac55c..ebe6116ee 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 { @@ -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 180040375..10f0489f9 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "com.android.tools.build:gradle:8.4.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } 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/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index 5946730f7..2bb37dc5e 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.10" + kotlinCompilerExtensionVersion = "1.5.13" } packaging { resources { @@ -66,11 +66,11 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.13.0") + implementation("androidx.core:core-ktx:1.13.1") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0") implementation("androidx.activity:activity-compose:1.9.0") - implementation(platform("androidx.compose:compose-bom:2024.04.01")) + implementation(platform("androidx.compose:compose-bom:2024.05.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:2024.04.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.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 7ff68238e..dda2a1e0c 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath 'com.android.tools.build:gradle:8.4.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicStateCodelab/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/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index 1778383a1..c4631ce4b 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.10" + kotlinCompilerExtensionVersion = "1.5.13" } packaging { resources { @@ -66,10 +66,10 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.13.0") + implementation("androidx.core:core-ktx:1.13.1") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") implementation("androidx.activity:activity-compose:1.9.0") - implementation(platform("androidx.compose:compose-bom:2024.04.01")) + implementation(platform("androidx.compose:compose-bom:2024.05.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:2024.04.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.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 151012a6d..b3e18f4f5 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.3.2" apply false - id("org.jetbrains.kotlin.android") version "1.9.22" apply false + id("com.android.application") version "8.4.0" apply false + id("org.jetbrains.kotlin.android") version "1.9.23" apply false } diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicsCodelab/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/app/build.gradle b/MigrationCodelab/app/build.gradle index d1f0e95f2..ca64b4be3 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 @@ -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..b0fe6821d 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "com.android.tools.build:gradle:8.4.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7" } } 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/app/build.gradle b/NavigationCodelab/app/build.gradle index 0b5dab35e..e4b1d41f3 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 { @@ -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..3448112a2 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "com.android.tools.build:gradle:8.4.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } 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/app/build.gradle b/TestingCodelab/app/build.gradle index 0d934c6c0..242090f9b 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -76,7 +76,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } packagingOptions { @@ -87,14 +87,14 @@ 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" - implementation "androidx.fragment:fragment-ktx:1.6.2" + implementation "androidx.fragment:fragment-ktx:1.7.0" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index d546834b3..b2550ec27 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "com.android.tools.build:gradle:8.4.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } 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/app/build.gradle b/ThemingCodelab/app/build.gradle index 0f01df11f..3f04fd4c8 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 { @@ -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-viewmodel-ktx:2.7.0" diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 7274301ac..e634673ec 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath 'com.android.tools.build:gradle:8.4.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } 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 diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index cef955fdb..bb9368358 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -41,15 +41,15 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.13' } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.01') + def composeBom = platform('androidx.compose:compose-bom:2024.05.00') implementation(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.material:material" implementation "androidx.compose.material:material-icons-extended" diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 27373e55e..cadef2373 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.3.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" + classpath "com.android.tools.build:gradle:8.4.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a80b22ce5 100644 --- a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties +++ b/ThemingCodelabM2/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