Skip to content

Update all dependencies (end) #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renovate wants to merge 6 commits into
base: end
Choose a base branch
from
Open

Update all dependencies (end) #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9aca948
Update all dependencies
renovate[bot] Aug 14, 2026
1b94063
Fixed the CI pipeline issue by removing the `kotlin.compiler.executio…
srikrishnasakunia Aug 15, 2026
1d2dbed
Update Java compatibility and Kotlin JVM target to Java 17 across cod…
srikrishnasakunia Aug 16, 2026
b0a6eda
Remove obsolete composeOptions block from NavigationCodelab
srikrishnasakunia Aug 16, 2026
3221f09
Enable KVM hardware acceleration for MigrationCodelab instrumentation…
srikrishnasakunia Aug 16, 2026
1123a70
Update ktlint version to 1.2.1 for Spotless 8.9.0 compatibility
srikrishnasakunia Aug 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/ci-gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx5120m
org.gradle.workers.max=2

kotlin.incremental=false
kotlin.compiler.execution.strategy=in-process
kotlin.incremental=false
32 changes: 11 additions & 21 deletions .github/workflows/MigrationCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

- uses: actions/cache@v6
with:
path: |
~/.gradle/caches/modules-*
~/.gradle/caches/jars-*
~/.gradle/caches/build-cache-*
key: gradle-${{ hashFiles('checksum.txt') }}
- uses: gradle/actions/setup-gradle@v6

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down Expand Up @@ -68,9 +59,17 @@ jobs:
api-level: [26, 29]

steps:
# https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners
- name: Enable KVM group perms
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
ls /dev/kvm

- name: Checkout
uses: actions/checkout@v7

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

Expand All @@ -80,16 +79,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

- uses: actions/cache@v6
with:
path: |
~/.gradle/caches/modules-*
~/.gradle/caches/jars-*
~/.gradle/caches/build-cache-*
key: gradle-${{ hashFiles('checksum.txt') }}
- uses: gradle/actions/setup-gradle@v6

- name: Run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
12 changes: 6 additions & 6 deletions AccessibilityCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildFeatures {
Expand All @@ -69,7 +69,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -95,7 +95,7 @@ dependencies {

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"

implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.appcompat:appcompat:1.8.0'
implementation 'androidx.activity:activity-ktx:1.13.0'
implementation 'androidx.core:core-ktx:1.19.0'
implementation "androidx.activity:activity-compose:1.13.0"
Expand Down Expand Up @@ -124,7 +124,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
// Enable experimental coroutines APIs, including Flow
freeCompilerArgs += '-opt-in=kotlin.Experimental'

// Set JVM target to 1.8
jvmTarget = "1.8"
// Set JVM target to 17
jvmTarget = "17"
}
}
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ subprojects {
targetExclude("$buildDir/**/*.kt")
targetExclude('bin/**/*.kt')

ktlint("0.45.2").userData([android: "true"])
ktlint("1.2.1")
licenseHeaderFile rootProject.file('spotless/copyright.kt')
}
}
Expand Down
Binary file modified AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
buildFeatures {
compose = true
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
androidGradlePlugin = "9.3.1"
composeBom = "2026.06.01"
composeBom = "2026.08.00"
coreKtx = "1.19.0"
activityCompose = "1.13.0"
espressoCore = "3.7.0"
Expand All @@ -9,7 +9,7 @@ junitVersion = "1.3.0"
kotlin = "2.3.10"
kotlinxCoroutinesAndroid = "1.10.2"
lifecycle = "2.11.0"
material3Adaptive = "1.2.0"
material3Adaptive = "1.3.0"
material3AdaptiveNavSuite = "1.4.0"
window = "1.5.1"

Expand Down
Binary file modified AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ dependencies {
}

implementation "androidx.activity:activity-compose:1.13.0"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.tracing:tracing:1.3.0"
implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.tracing:tracing:2.0.0"

def composeBom = platform('androidx.compose:compose-bom:2026.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ buildscript {

plugins {
id 'com.diffplug.spotless' version '8.9.0'
id 'com.google.devtools.ksp' version '2.3.10' apply false
id 'com.google.devtools.ksp' version '2.3.11' apply false
}

subprojects {
Expand All @@ -43,7 +43,7 @@ subprojects {
target '**/*.kt'
targetExclude("$buildDir/**/*.kt")
targetExclude('bin/**/*.kt')
ktlint("0.45.2")
ktlint("1.2.1")
licenseHeaderFile rootProject.file('spotless/copyright.kt')
}
}
Expand Down
Binary file modified AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
6 changes: 3 additions & 3 deletions BasicLayoutsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
buildFeatures {
compose true
Expand All @@ -57,7 +57,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ subprojects {
targetExclude("$buildDir/**/*.kt")
targetExclude('bin/**/*.kt')

ktlint("0.45.2").userData([android: "true"])
ktlint("1.2.1")
licenseHeaderFile rootProject.file('spotless/copyright.kt')
}
}
Expand Down
Binary file modified BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
8 changes: 4 additions & 4 deletions MigrationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)
androidTestImplementation(composeBom)

kapt "androidx.room:room-compiler:2.8.4"
kapt "com.github.bumptech.glide:compiler:5.0.9"
kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.constraintlayout:constraintlayout:2.2.2"
implementation "androidx.core:core-ktx:1.19.0"
implementation "androidx.fragment:fragment-ktx:1.8.9"
implementation "androidx.fragment:fragment-ktx:1.9.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.11.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0"
implementation "androidx.navigation:navigation-fragment-ktx:2.9.8"
implementation "androidx.navigation:navigation-ui-ktx:2.9.8"
implementation "androidx.recyclerview:recyclerview:1.4.0"
implementation "androidx.room:room-runtime:2.8.4"
implementation "androidx.room:room-ktx:2.8.4"
implementation "androidx.tracing:tracing:1.3.0"
implementation "androidx.tracing:tracing:2.0.0"
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.11.2"
implementation "com.github.bumptech.glide:glide:5.0.9"
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ spotless {
target "**/*.kt"
targetExclude("$buildDir/**/*.kt")
targetExclude('bin/**/*.kt')
ktlint("0.46.1")
ktlint("1.2.1")
}
}
Binary file modified MigrationCodelab/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
16 changes: 6 additions & 10 deletions NavigationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,14 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildFeatures {
compose true
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.15'
}

packagingOptions {
exclude "META-INF/licenses/**"
exclude "META-INF/AL2.0"
Expand All @@ -76,11 +72,11 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)
androidTestImplementation(composeBom)

implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.core:core-ktx:1.19.0"
implementation "com.google.android.material:material:1.14.0"

Expand Down Expand Up @@ -112,7 +108,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {

freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'

// Set JVM target to 1.8
jvmTarget = "1.8"
// Set JVM target to 17
jvmTarget = "17"
}
}
2 changes: 1 addition & 1 deletion NavigationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ subprojects {
targetExclude("$buildDir/**/*.kt")
targetExclude('bin/**/*.kt')

ktlint("0.46.1")
ktlint("1.2.1")
licenseHeaderFile rootProject.file('spotless/copyright.kt')
}
}
Expand Down
Binary file modified NavigationCodelab/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
2 changes: 1 addition & 1 deletion PerformanceCodelab/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies {
implementation(libs.androidx.tracing.ktx)

// TODO Codelab task: Add androidx.runtime-tracing dependency to enable Composition Tracing
implementation("androidx.compose.runtime:runtime-tracing:1.11.4")
implementation("androidx.compose.runtime:runtime-tracing:1.12.0")

implementation(libs.coil.compose)
implementation(libs.androidx.media3.exoplayer)
Expand Down
10 changes: 5 additions & 5 deletions PerformanceCodelab/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ desugar_jdk_libs = "2.1.5"
kotlinx-datetime = "0.7.1-0.6.x-compat"
lifecycle-viewmodel-compose = "2.11.0"
material-icons-core = "1.7.8"
media3 = "1.10.1"
media3 = "1.11.0"
org-jetbrains-kotlin-android = "2.3.10"
core-ktx = "1.19.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.3.0"
espresso-core = "3.7.0"
lifecycle-runtime-ktx = "2.11.0"
activity-compose = "1.13.0"
compose-bom = "2026.06.01"
runtime-tracing = "1.11.4"
tracing-ktx = "1.3.0"
compose-bom = "2026.08.00"
runtime-tracing = "1.12.0"
tracing-ktx = "2.0.0"
tracing-perfetto = "1.0.1"
uiautomator = "2.4.0"
benchmark = "1.4.1"
androidx-baselineprofile = "1.5.0-beta01"
androidx-baselineprofile = "1.5.0-rc01"
profileinstaller = "1.4.1"
material3 = "1.4.0"
spotless = "8.9.0"
Expand Down
Binary file modified PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
Loading