From 11162aee5aa68186b8f0fbe84fa43cbe2260b1e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 08:54:07 +0000 Subject: [PATCH] Update all dependencies (main) (#393) * Update all dependencies * Update Kotlin to 1.9.20 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jolanda Verhoef --- AccessibilityCodelab/app/build.gradle | 12 +++++----- AccessibilityCodelab/build.gradle | 4 ++-- AdaptiveUICodelab/app/build.gradle | 8 +++---- AdaptiveUICodelab/build.gradle | 4 ++-- .../app/build.gradle | 10 ++++----- .../build.gradle | 4 ++-- AnimationCodelab/build.gradle | 4 ++-- AnimationCodelab/finished/build.gradle | 6 ++--- AnimationCodelab/start/build.gradle | 6 ++--- BasicLayoutsCodelab/app/build.gradle | 6 ++--- BasicLayoutsCodelab/build.gradle | 4 ++-- BasicStateCodelab/app/build.gradle.kts | 8 +++---- BasicStateCodelab/build.gradle | 4 ++-- BasicsCodelab/app/build.gradle.kts | 8 +++---- BasicsCodelab/build.gradle.kts | 4 ++-- MigrationCodelab/app/build.gradle | 22 +++++++++---------- MigrationCodelab/build.gradle | 6 ++--- NavigationCodelab/app/build.gradle | 6 ++--- NavigationCodelab/build.gradle | 4 ++-- TestingCodelab/app/build.gradle | 10 ++++----- TestingCodelab/build.gradle | 4 ++-- ThemingCodelab/app/build.gradle | 8 +++---- ThemingCodelab/build.gradle | 4 ++-- ThemingCodelabM2/app/build.gradle | 6 ++--- ThemingCodelabM2/build.gradle | 4 ++-- 25 files changed, 83 insertions(+), 83 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 6b46f4b34..8fb03b2a8 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } packagingOptions { @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -117,23 +117,23 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.activity:activity-ktx:1.8.0' + implementation 'androidx.activity:activity-ktx:1.8.1' implementation 'androidx.core:core-ktx:1.12.0' - implementation "androidx.activity:activity-compose:1.8.0" + implementation "androidx.activity:activity-compose:1.8.1" 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.navigation:navigation-compose:2.7.4' + implementation 'androidx.navigation:navigation-compose:2.7.5' androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation 'androidx.test:runner:1.5.2' // 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.10.3' + testImplementation 'org.robolectric:robolectric:4.11.1' } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index aff821062..66342a794 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath 'com.android.tools.build:gradle:8.1.4' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } } diff --git a/AdaptiveUICodelab/app/build.gradle b/AdaptiveUICodelab/app/build.gradle index df1fb30aa..b462ab1b3 100644 --- a/AdaptiveUICodelab/app/build.gradle +++ b/AdaptiveUICodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } packagingOptions { resources { @@ -65,7 +65,7 @@ android { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) androidTestImplementation(composeBom) @@ -78,9 +78,9 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2" implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2" - implementation 'androidx.activity:activity-compose:1.8.0' + implementation 'androidx.activity:activity-compose:1.8.1' implementation 'androidx.core:core-ktx:1.12.0' - implementation "androidx.window:window:1.1.0" + implementation "androidx.window:window:1.2.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" testImplementation 'junit:junit:4.13.2' diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle index 512f16ee8..61cf29d46 100644 --- a/AdaptiveUICodelab/build.gradle +++ b/AdaptiveUICodelab/build.gradle @@ -19,8 +19,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.1.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath "com.android.tools.build:gradle:8.1.4" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 726de7a1f..44917d455 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -84,7 +84,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } packagingOptions { @@ -96,7 +96,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" implementation "com.google.android.libraries.maps:maps:3.1.0-beta" implementation "com.google.maps.android:maps-v3-ktx:3.4.0" @@ -107,10 +107,10 @@ dependencies { } } - implementation "androidx.activity:activity-compose:1.8.0" + implementation "androidx.activity:activity-compose:1.8.1" implementation "androidx.appcompat:appcompat:1.6.1" - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -129,7 +129,7 @@ dependencies { implementation "com.google.dagger:hilt-android:2.48.1" kapt "com.google.dagger:hilt-compiler:2.48.1" - implementation "io.coil-kt:coil-compose:2.4.0" + implementation "io.coil-kt:coil-compose:2.5.0" androidTestImplementation "junit:junit:4.13.2" androidTestImplementation "androidx.test:core:1.5.0" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 211cb850c..28c40ba34 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.1.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath "com.android.tools.build:gradle:8.1.4" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" classpath "com.google.dagger:hilt-android-gradle-plugin:2.48.1" } } diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index f0357e39d..7df66fc42 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath 'com.android.tools.build:gradle:8.1.4' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index 000362f7a..23fba0f11 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -40,15 +40,15 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.8.0' + implementation 'androidx.activity:activity-compose:1.8.1' implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material:material" diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index 000362f7a..23fba0f11 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -40,15 +40,15 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.8.0' + implementation 'androidx.activity:activity-compose:1.8.1' implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material:material" diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 241f12bde..8023348fd 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } packagingOptions { resources { @@ -63,7 +63,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) androidTestImplementation(composeBom) @@ -75,7 +75,7 @@ dependencies { implementation "androidx.compose.ui:ui-tooling-preview" implementation "com.google.android.material:material:1.10.0" implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' - implementation 'androidx.activity:activity-compose:1.8.0' + implementation 'androidx.activity:activity-compose:1.8.1' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 314a09c36..7f37d4e56 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.1.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath "com.android.tools.build:gradle:8.1.4" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } } diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index 3ab8b0949..c488bccad 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.3" + kotlinCompilerExtensionVersion = "1.5.4" } packaging { resources { @@ -69,8 +69,8 @@ dependencies { implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2") - implementation("androidx.activity:activity-compose:1.8.0") - implementation(platform("androidx.compose:compose-bom:2023.10.00")) + implementation("androidx.activity:activity-compose:1.8.1") + implementation(platform("androidx.compose:compose-bom:2023.10.01")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -78,7 +78,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01")) 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 e42226ed9..fcb3b9a86 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath 'com.android.tools.build:gradle:8.1.4' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } } diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index ebececc6d..b4fcaafd2 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.3" + kotlinCompilerExtensionVersion = "1.5.4" } packaging { resources { @@ -68,8 +68,8 @@ android { dependencies { implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") - implementation("androidx.activity:activity-compose:1.8.0") - implementation(platform("androidx.compose:compose-bom:2023.10.00")) + implementation("androidx.activity:activity-compose:1.8.1") + implementation(platform("androidx.compose:compose-bom:2023.10.01")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -78,7 +78,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01")) 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 749fcb6a0..9cbe522f7 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.1.2" apply false - id("org.jetbrains.kotlin.android") version "1.9.10" apply false + id("com.android.application") version "8.1.4" apply false + id("org.jetbrains.kotlin.android") version "1.9.20" apply false } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index d59e7b270..01814dc30 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -50,7 +50,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } packagingOptions { // Multiple dependency bring these files in. Exclude them to enable @@ -61,29 +61,29 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) androidTestImplementation(composeBom) - kapt "androidx.room:room-compiler:2.5.2" + kapt "androidx.room:room-compiler:2.6.0" 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.12.0" - implementation "androidx.fragment:fragment-ktx:1.6.1" + 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.navigation:navigation-fragment-ktx:2.7.4" - implementation "androidx.navigation:navigation-ui-ktx:2.7.4" - implementation "androidx.recyclerview:recyclerview:1.3.1" - implementation "androidx.room:room-runtime:2.5.2" - implementation "androidx.room:room-ktx:2.5.2" + implementation "androidx.navigation:navigation-fragment-ktx:2.7.5" + implementation "androidx.navigation:navigation-ui-ktx:2.7.5" + implementation "androidx.recyclerview:recyclerview:1.3.2" + implementation "androidx.room:room-runtime:2.6.0" + implementation "androidx.room:room-ktx:2.6.0" implementation "androidx.viewpager2:viewpager2:1.0.0" implementation "androidx.work:work-runtime-ktx:2.8.1" implementation "com.github.bumptech.glide:glide:4.16.0" implementation "com.google.android.material:material:1.10.0" implementation "com.google.code.gson:gson:2.10.1" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3" @@ -105,7 +105,7 @@ dependencies { androidTestImplementation "androidx.test.ext:junit:1.1.5" androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0" androidTestImplementation "androidx.work:work-testing:2.8.1" - androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.0.0" + androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.0" androidTestImplementation "com.google.truth:truth:1.1.5" androidTestImplementation "androidx.compose.ui:ui-test-junit4" testImplementation "junit:junit:4.13.2" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 284187477..40290a17f 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.1.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.4" + classpath "com.android.tools.build:gradle:8.1.4" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.5" } } diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index ec5467adc..ef1db4179 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -69,7 +69,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } packagingOptions { @@ -80,7 +80,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) androidTestImplementation(composeBom) @@ -94,7 +94,7 @@ dependencies { implementation "androidx.compose.foundation:foundation" implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" - implementation "androidx.activity:activity-compose:1.8.0" + implementation "androidx.activity:activity-compose:1.8.1" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index adcff741a..a4a7cfe3d 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.1.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath "com.android.tools.build:gradle:8.1.4" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } } diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 4c502bb7b..29ff6555a 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -76,7 +76,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } packagingOptions { @@ -87,15 +87,15 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.6.1" implementation "androidx.core:core-ktx:1.12.0" implementation "com.google.android.material:material:1.10.0" - implementation "androidx.fragment:fragment-ktx:1.6.1" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" + implementation "androidx.fragment:fragment-ktx:1.6.2" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20" // Compose implementation "androidx.compose.runtime:runtime" @@ -107,7 +107,7 @@ dependencies { implementation "androidx.compose.runtime:runtime-livedata" implementation "androidx.compose.ui:ui-tooling-preview" implementation "androidx.compose.material:material-icons-extended" - implementation "androidx.activity:activity-compose:1.8.0" + implementation "androidx.activity:activity-compose:1.8.1" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index ad073478a..0c15304d2 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.1.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath "com.android.tools.build:gradle:8.1.4" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 64c17813c..672dce5c1 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } packagingOptions { @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -113,9 +113,9 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.activity:activity-ktx:1.8.0' + implementation 'androidx.activity:activity-ktx:1.8.1' implementation 'androidx.core:core-ktx:1.12.0' - implementation "androidx.activity:activity-compose:1.8.0" + implementation "androidx.activity:activity-compose:1.8.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2" diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 9af3594b0..18cd404e2 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath 'com.android.tools.build:gradle:8.1.4' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } } diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index d058b45cb..f2c0fdbf0 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -41,19 +41,19 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.3' + kotlinCompilerExtensionVersion '1.5.4' } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.01') implementation(composeBom) implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" - implementation 'androidx.activity:activity-compose:1.8.0' + implementation 'androidx.activity:activity-compose:1.8.1' implementation "androidx.compose.ui:ui-tooling-preview" debugImplementation "androidx.compose.ui:ui-tooling" } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index c19f9179e..78903d19a 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.1.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + classpath "com.android.tools.build:gradle:8.1.4" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } }