diff --git a/.github/workflows/AccessibilityCodelab.yaml b/.github/workflows/AccessibilityCodelab.yaml index b76b4ceb2..a7131d369 100644 --- a/.github/workflows/AccessibilityCodelab.yaml +++ b/.github/workflows/AccessibilityCodelab.yaml @@ -27,7 +27,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 40c2d194e..defe0f0e3 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -27,7 +27,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 @@ -76,7 +76,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/AnimationCodelab.yaml b/.github/workflows/AnimationCodelab.yaml index ad714ab10..ede9e8693 100644 --- a/.github/workflows/AnimationCodelab.yaml +++ b/.github/workflows/AnimationCodelab.yaml @@ -26,7 +26,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/BasicLayoutsCodelab.yaml b/.github/workflows/BasicLayoutsCodelab.yaml index 8fe0c9cf6..e2845abd8 100644 --- a/.github/workflows/BasicLayoutsCodelab.yaml +++ b/.github/workflows/BasicLayoutsCodelab.yaml @@ -26,7 +26,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/BasicStateCodelab.yaml b/.github/workflows/BasicStateCodelab.yaml index df3c4d8bc..9ddd39696 100644 --- a/.github/workflows/BasicStateCodelab.yaml +++ b/.github/workflows/BasicStateCodelab.yaml @@ -26,7 +26,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/BasicsCodelab.yaml b/.github/workflows/BasicsCodelab.yaml index 1893e3a72..33022843a 100644 --- a/.github/workflows/BasicsCodelab.yaml +++ b/.github/workflows/BasicsCodelab.yaml @@ -26,7 +26,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/MigrationCodelab.yaml b/.github/workflows/MigrationCodelab.yaml index cf48d14eb..4548b384f 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -27,7 +27,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 @@ -76,7 +76,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/NavigationCodelab.yaml b/.github/workflows/NavigationCodelab.yaml index 95b10cdbd..90d29880f 100644 --- a/.github/workflows/NavigationCodelab.yaml +++ b/.github/workflows/NavigationCodelab.yaml @@ -27,7 +27,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/TestingCodelab.yaml b/.github/workflows/TestingCodelab.yaml index 01dfd4eff..1c3afdb91 100644 --- a/.github/workflows/TestingCodelab.yaml +++ b/.github/workflows/TestingCodelab.yaml @@ -27,7 +27,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/ThemingCodelab.yaml b/.github/workflows/ThemingCodelab.yaml index 57fba00b6..03ef5c3b9 100644 --- a/.github/workflows/ThemingCodelab.yaml +++ b/.github/workflows/ThemingCodelab.yaml @@ -26,7 +26,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 8fb03b2a8..dfc5ddb68 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } packagingOptions { diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 66342a794..af33f01f5 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.22.0' + id 'com.diffplug.spotless' version '6.23.2' } subprojects { diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdaptiveUICodelab/app/build.gradle b/AdaptiveUICodelab/app/build.gradle index b462ab1b3..0539363fd 100644 --- a/AdaptiveUICodelab/app/build.gradle +++ b/AdaptiveUICodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } packagingOptions { resources { diff --git a/AdaptiveUICodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUICodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 44917d455..e11359123 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -84,7 +84,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } packagingOptions { diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 28c40ba34..c0ae9d282 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.22.0' + id 'com.diffplug.spotless' version '6.23.2' } subprojects { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index f59ad5422..2e73d4420 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -40,7 +40,7 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } } diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index f59ad5422..2e73d4420 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -40,7 +40,7 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } } diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 8023348fd..af7f06c19 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } packagingOptions { resources { diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 7f37d4e56..090c4335f 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -26,7 +26,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.22.0' + id 'com.diffplug.spotless' version '6.23.2' } subprojects { diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-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 c488bccad..33e98d11d 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.4" + kotlinCompilerExtensionVersion = "1.5.5" } packaging { resources { diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index fcb3b9a86..99ea41c44 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -26,7 +26,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.22.0' + id 'com.diffplug.spotless' version '6.23.2' } subprojects { diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-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 b4fcaafd2..7fb479696 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.4" + kotlinCompilerExtensionVersion = "1.5.5" } packaging { resources { diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 01814dc30..0c9598e3d 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -50,7 +50,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } packagingOptions { // Multiple dependency bring these files in. Exclude them to enable @@ -65,7 +65,7 @@ dependencies { implementation(composeBom) androidTestImplementation(composeBom) - kapt "androidx.room:room-compiler:2.6.0" + kapt "androidx.room:room-compiler:2.6.1" kapt "com.github.bumptech.glide:compiler:4.16.0" implementation "androidx.appcompat:appcompat:1.6.1" implementation "androidx.constraintlayout:constraintlayout:2.1.4" @@ -76,10 +76,10 @@ dependencies { 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.room:room-runtime:2.6.1" + implementation "androidx.room:room-ktx:2.6.1" implementation "androidx.viewpager2:viewpager2:1.0.0" - implementation "androidx.work:work-runtime-ktx:2.8.1" + implementation "androidx.work:work-runtime-ktx:2.9.0" implementation "com.github.bumptech.glide:glide:4.16.0" implementation "com.google.android.material:material:1.10.0" implementation "com.google.code.gson:gson:2.10.1" @@ -104,7 +104,7 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-intents:3.5.1" 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 "androidx.work:work-testing:2.9.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" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 40290a17f..aab1512d8 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -28,7 +28,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.22.0' + id 'com.diffplug.spotless' version '6.23.2' } allprojects { diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index ef1db4179..148c37d37 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -69,7 +69,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } packagingOptions { diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index a4a7cfe3d..8418108f8 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.22.0' + id 'com.diffplug.spotless' version '6.23.2' } subprojects { diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 29ff6555a..b0e19fa60 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -76,7 +76,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } packagingOptions { diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 0c15304d2..8ffbb939e 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.22.0' + id 'com.diffplug.spotless' version '6.23.2' } subprojects { diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 672dce5c1..2a35389d6 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } packagingOptions { diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 18cd404e2..197ef6787 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.22.0' + id 'com.diffplug.spotless' version '6.23.2' } subprojects { diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index f2c0fdbf0..6a41d72de 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -41,7 +41,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.4' + kotlinCompilerExtensionVersion '1.5.5' } } diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME