From 5b82941095cbea29c3fd6685ec5b812e36ea052c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 19:44:09 +0000 Subject: [PATCH] Update all dependencies --- AccessibilityCodelab/app/build.gradle | 12 ++++++------ AccessibilityCodelab/build.gradle | 4 ++-- AdaptiveUICodelab/app/build.gradle | 8 ++++---- AdaptiveUICodelab/build.gradle | 4 ++-- .../app/build.gradle | 18 +++++++++--------- .../build.gradle | 6 +++--- AnimationCodelab/build.gradle | 2 +- AnimationCodelab/finished/build.gradle | 6 +++--- AnimationCodelab/start/build.gradle | 6 +++--- BasicLayoutsCodelab/app/build.gradle | 6 +++--- BasicLayoutsCodelab/build.gradle | 6 +++--- BasicStateCodelab/app/build.gradle | 6 +++--- BasicStateCodelab/build.gradle | 6 +++--- BasicsCodelab/app/build.gradle | 6 +++--- BasicsCodelab/build.gradle | 4 ++-- MigrationCodelab/app/build.gradle | 12 ++++++------ MigrationCodelab/build.gradle | 6 +++--- NavigationCodelab/app/build.gradle | 6 +++--- NavigationCodelab/build.gradle | 4 ++-- TestingCodelab/app/build.gradle | 8 ++++---- TestingCodelab/build.gradle | 4 ++-- ThemingCodelab/app/build.gradle | 8 ++++---- ThemingCodelab/build.gradle | 4 ++-- ThemingCodelabM2/app/build.gradle | 6 +++--- ThemingCodelabM2/build.gradle | 2 +- 25 files changed, 80 insertions(+), 80 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 5bd50725e..8bb4c8e92 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.4.7' } packagingOptions { @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -118,23 +118,23 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.activity:activity-ktx:1.7.1' + implementation 'androidx.activity:activity-ktx:1.7.2' implementation 'androidx.core:core-ktx:1.10.1' - implementation "androidx.activity:activity-compose:1.7.1" + implementation "androidx.activity:activity-compose:1.7.2" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1" implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" - implementation 'androidx.navigation:navigation-compose:2.5.3' + implementation 'androidx.navigation:navigation-compose:2.6.0' 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.2' + testImplementation 'org.robolectric:robolectric:4.10.3' } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index d57261fc2..063c16050 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" } } plugins { - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' } subprojects { diff --git a/AdaptiveUICodelab/app/build.gradle b/AdaptiveUICodelab/app/build.gradle index dc61540db..059816754 100644 --- a/AdaptiveUICodelab/app/build.gradle +++ b/AdaptiveUICodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.4.7' } packagingOptions { resources { @@ -65,7 +65,7 @@ android { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -78,9 +78,9 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1" - implementation 'androidx.activity:activity-compose:1.7.1' + implementation 'androidx.activity:activity-compose:1.7.2' implementation 'androidx.core:core-ktx:1.10.1' - implementation "androidx.window:window:1.0.0" + implementation "androidx.window:window:1.1.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" testImplementation 'junit:junit:4.13.2' diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle index fec667650..9f0b32e61 100644 --- a/AdaptiveUICodelab/build.gradle +++ b/AdaptiveUICodelab/build.gradle @@ -14,8 +14,8 @@ * limitations under the License. */ plugins { - id 'com.android.application' version "8.0.1" apply false - id 'com.android.library' version "8.0.1" apply false + id 'com.android.application' version "8.0.2" apply false + id 'com.android.library' version "8.0.2" apply false id 'org.jetbrains.kotlin.android' version "1.8.20" apply false } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 456a8608b..1557744af 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -84,7 +84,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion "1.4.6" + kotlinCompilerExtensionVersion "1.4.7" } packagingOptions { @@ -107,10 +107,10 @@ dependencies { } } - implementation "androidx.activity:activity-compose:1.7.1" + implementation "androidx.activity:activity-compose:1.7.2" implementation "androidx.appcompat:appcompat:1.6.1" - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -126,10 +126,10 @@ dependencies { def lifecycle_version = "2.6.1" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "com.google.dagger:hilt-android:2.46" - kapt "com.google.dagger:hilt-compiler:2.46" + implementation "com.google.dagger:hilt-android:2.46.1" + kapt "com.google.dagger:hilt-compiler:2.46.1" - implementation "io.coil-kt:coil-compose:2.3.0" + implementation "io.coil-kt:coil-compose:2.4.0" androidTestImplementation "junit:junit:4.13.2" androidTestImplementation "androidx.test:core:1.5.0" @@ -138,7 +138,7 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5" androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4" - androidTestImplementation "com.google.dagger:hilt-android:2.46" - androidTestImplementation "com.google.dagger:hilt-android-testing:2.46" - kaptAndroidTest "com.google.dagger:hilt-compiler:2.46" + androidTestImplementation "com.google.dagger:hilt-android:2.46.1" + androidTestImplementation "com.google.dagger:hilt-android-testing:2.46.1" + kaptAndroidTest "com.google.dagger:hilt-compiler:2.46.1" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 3e8762a85..e25f82a76 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.0.1" + classpath "com.android.tools.build:gradle:8.0.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" - classpath "com.google.dagger:hilt-android-gradle-plugin:2.46" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.46.1" } } plugins { - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' } subprojects { diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 667399f12..21aafafd3 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" } } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index 688d9f921..ead7d944b 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -40,15 +40,15 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.4.7' } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.7.1' + implementation 'androidx.activity:activity-compose:1.7.2' implementation 'androidx.core:core-ktx:1.10.1' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material:material" diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index 688d9f921..ead7d944b 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -40,15 +40,15 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.4.7' } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.7.1' + implementation 'androidx.activity:activity-compose:1.7.2' implementation 'androidx.core:core-ktx:1.10.1' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material:material" diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 8feef8d06..6432be95a 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.4.7' } packagingOptions { resources { @@ -63,7 +63,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -74,7 +74,7 @@ dependencies { implementation "androidx.compose.ui:ui-tooling-preview" implementation "com.google.android.material:material:1.9.0" implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.activity:activity-compose:1.7.1' + implementation 'androidx.activity:activity-compose:1.7.2' 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 5c929d8b9..62824f6eb 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -21,10 +21,10 @@ buildscript { } }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.0.1' apply false - id 'com.android.library' version '8.0.1' apply false + id 'com.android.application' version '8.0.2' apply false + id 'com.android.library' version '8.0.2' apply false id 'org.jetbrains.kotlin.android' version '1.8.20' apply false - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' } subprojects { diff --git a/BasicStateCodelab/app/build.gradle b/BasicStateCodelab/app/build.gradle index cb4de4e4b..22ef6494d 100644 --- a/BasicStateCodelab/app/build.gradle +++ b/BasicStateCodelab/app/build.gradle @@ -51,7 +51,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.4.7' } packagingOptions { resources { @@ -61,7 +61,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" implementation 'androidx.core:core-ktx:1.10.1' @@ -70,5 +70,5 @@ dependencies { implementation "androidx.compose.ui:ui-tooling-preview" debugImplementation "androidx.compose.ui:ui-tooling" implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.activity:activity-compose:1.7.1' + implementation 'androidx.activity:activity-compose:1.7.2' } diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index 916eea3bf..ecab40ce4 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -14,10 +14,10 @@ * limitations under the License. */ plugins { - id 'com.android.application' version '8.0.1' apply false - id 'com.android.library' version '8.0.1' apply false + id 'com.android.application' version '8.0.2' apply false + id 'com.android.library' version '8.0.2' apply false id 'org.jetbrains.kotlin.android' version '1.8.20' apply false - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' } subprojects { diff --git a/BasicsCodelab/app/build.gradle b/BasicsCodelab/app/build.gradle index ac8d80fb8..7431256af 100644 --- a/BasicsCodelab/app/build.gradle +++ b/BasicsCodelab/app/build.gradle @@ -54,18 +54,18 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion "1.4.6" + kotlinCompilerExtensionVersion "1.4.7" } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) androidTestImplementation(composeBom) implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.activity:activity-compose:1.7.1' + implementation 'androidx.activity:activity-compose:1.7.2' implementation "androidx.compose.ui:ui" implementation "androidx.compose.ui:ui-tooling-preview" implementation 'androidx.compose.material3:material3' diff --git a/BasicsCodelab/build.gradle b/BasicsCodelab/build.gradle index 548dc8fd8..cb8bde3bb 100644 --- a/BasicsCodelab/build.gradle +++ b/BasicsCodelab/build.gradle @@ -16,7 +16,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.0.1' apply false - id 'com.android.library' version '8.0.1' apply false + id 'com.android.application' version '8.0.2' apply false + id 'com.android.library' version '8.0.2' apply false id 'org.jetbrains.kotlin.android' version '1.8.20' apply false } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index a3a928a67..d552e29a4 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -50,7 +50,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.4.7' } packagingOptions { // Multiple dependency bring these files in. Exclude them to enable @@ -61,7 +61,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -70,11 +70,11 @@ dependencies { implementation "androidx.appcompat:appcompat:1.6.1" implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation "androidx.core:core-ktx:1.10.1" - implementation "androidx.fragment:fragment-ktx:1.5.7" + implementation "androidx.fragment:fragment-ktx:1.6.0" implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" - implementation "androidx.navigation:navigation-fragment-ktx:2.5.3" - implementation "androidx.navigation:navigation-ui-ktx:2.5.3" + implementation "androidx.navigation:navigation-fragment-ktx:2.6.0" + implementation "androidx.navigation:navigation-ui-ktx:2.6.0" implementation "androidx.recyclerview:recyclerview:1.3.0" implementation "androidx.room:room-runtime:2.5.1" implementation "androidx.room:room-ktx:2.5.1" @@ -108,7 +108,7 @@ dependencies { 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.truth:truth:1.1.3" + androidTestImplementation "com.google.truth:truth:1.1.4" androidTestImplementation "androidx.compose.ui:ui-test-junit4" testImplementation "junit:junit:4.13.2" } \ No newline at end of file diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index dab42b0ff..a277188d4 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.0.1" + classpath "com.android.tools.build:gradle:8.0.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0" } } plugins { - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' } allprojects { diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 8d4a7b12d..250388d9b 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -69,7 +69,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion "1.4.6" + kotlinCompilerExtensionVersion "1.4.7" } packagingOptions { @@ -80,7 +80,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') 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.7.1" + implementation "androidx.activity:activity-compose:1.7.2" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 863ad3596..f30e0c454 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.0.1" + classpath "com.android.tools.build:gradle:8.0.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" } } plugins { - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' } subprojects { diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 4087b3ff2..18a9a5068 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -76,7 +76,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion "1.4.6" + kotlinCompilerExtensionVersion "1.4.7" } packagingOptions { @@ -87,14 +87,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.6.1" implementation "androidx.core:core-ktx:1.10.1" implementation "com.google.android.material:material:1.9.0" - implementation "androidx.fragment:fragment-ktx:1.5.7" + implementation "androidx.fragment:fragment-ktx:1.6.0" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20" // Compose @@ -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.7.1" + implementation "androidx.activity:activity-compose:1.7.2" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 18b3b8b7c..830bcc2ab 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.0.1" + classpath "com.android.tools.build:gradle:8.0.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" } } plugins { - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' } subprojects { diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index adfd9a93c..55283cdbe 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.4.7' } packagingOptions { @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -113,9 +113,9 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.activity:activity-ktx:1.7.1' + implementation 'androidx.activity:activity-ktx:1.7.2' implementation 'androidx.core:core-ktx:1.10.1' - implementation "androidx.activity:activity-compose:1.7.1" + implementation "androidx.activity:activity-compose:1.7.2" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1" diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index e5ed5359f..51230688d 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" } } plugins { - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' } subprojects { diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 44574a2d6..671cfe7e3 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -41,19 +41,19 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.4.7' } } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.05.01') + def composeBom = platform('androidx.compose:compose-bom:2023.06.00') implementation(composeBom) implementation 'androidx.core:core-ktx:1.10.1' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" - implementation 'androidx.activity:activity-compose:1.7.1' + implementation 'androidx.activity:activity-compose:1.7.2' implementation "androidx.compose.ui:ui-tooling-preview" debugImplementation "androidx.compose.ui:ui-tooling" } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 13861d688..3ec306a0a 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.0.1" + classpath "com.android.tools.build:gradle:8.0.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" } }