Skip to content

Commit f155e22

Browse files
Merge pull request #582 from android/renovate/end-all
Update all dependencies (end)
2 parents d4bec44 + 1123a70 commit f155e22

38 files changed

Lines changed: 74 additions & 89 deletions

.github/ci-gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,4 @@ org.gradle.parallel=true
1919
org.gradle.jvmargs=-Xmx5120m
2020
org.gradle.workers.max=2
2121

22-
kotlin.incremental=false
23-
kotlin.compiler.execution.strategy=in-process
22+
kotlin.incremental=false

.github/workflows/MigrationCodelab.yaml

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,7 @@ jobs:
3131
distribution: 'zulu'
3232
java-version: 17
3333

34-
- name: Generate cache key
35-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
36-
37-
- uses: actions/cache@v6
38-
with:
39-
path: |
40-
~/.gradle/caches/modules-*
41-
~/.gradle/caches/jars-*
42-
~/.gradle/caches/build-cache-*
43-
key: gradle-${{ hashFiles('checksum.txt') }}
34+
- uses: gradle/actions/setup-gradle@v6
4435

4536
- name: Build project
4637
working-directory: ${{ env.SAMPLE_PATH }}
@@ -68,9 +59,17 @@ jobs:
6859
api-level: [26, 29]
6960

7061
steps:
62+
# https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners
63+
- name: Enable KVM group perms
64+
run: |
65+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
66+
sudo udevadm control --reload-rules
67+
sudo udevadm trigger --name-match=kvm
68+
ls /dev/kvm
69+
7170
- name: Checkout
7271
uses: actions/checkout@v7
73-
72+
7473
- name: Copy CI gradle.properties
7574
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
7675

@@ -80,16 +79,7 @@ jobs:
8079
distribution: 'zulu'
8180
java-version: 17
8281

83-
- name: Generate cache key
84-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
85-
86-
- uses: actions/cache@v6
87-
with:
88-
path: |
89-
~/.gradle/caches/modules-*
90-
~/.gradle/caches/jars-*
91-
~/.gradle/caches/build-cache-*
92-
key: gradle-${{ hashFiles('checksum.txt') }}
82+
- uses: gradle/actions/setup-gradle@v6
9383

9484
- name: Run instrumentation tests
9585
uses: reactivecircus/android-emulator-runner@v2

AccessibilityCodelab/app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ android {
5454
}
5555

5656
compileOptions {
57-
sourceCompatibility JavaVersion.VERSION_1_8
58-
targetCompatibility JavaVersion.VERSION_1_8
57+
sourceCompatibility JavaVersion.VERSION_17
58+
targetCompatibility JavaVersion.VERSION_17
5959
}
6060

6161
buildFeatures {
@@ -69,7 +69,7 @@ android {
6969
}
7070

7171
dependencies {
72-
def composeBom = platform('androidx.compose:compose-bom:2026.06.01')
72+
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
7373
implementation(composeBom)
7474
testImplementation(composeBom)
7575
androidTestImplementation(composeBom)
@@ -95,7 +95,7 @@ dependencies {
9595

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

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

127-
// Set JVM target to 1.8
128-
jvmTarget = "1.8"
127+
// Set JVM target to 17
128+
jvmTarget = "17"
129129
}
130130
}

AccessibilityCodelab/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ subprojects {
4444
targetExclude("$buildDir/**/*.kt")
4545
targetExclude('bin/**/*.kt')
4646

47-
ktlint("0.45.2").userData([android: "true"])
47+
ktlint("1.2.1")
4848
licenseHeaderFile rootProject.file('spotless/copyright.kt')
4949
}
5050
}
-957 Bytes
Binary file not shown.

AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
44
networkTimeout=10000
55
retries=0
66
retryBackOffMs=500

AdaptiveUiCodelab/app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ android {
4646
}
4747
}
4848
compileOptions {
49-
sourceCompatibility = JavaVersion.VERSION_1_8
50-
targetCompatibility = JavaVersion.VERSION_1_8
49+
sourceCompatibility = JavaVersion.VERSION_17
50+
targetCompatibility = JavaVersion.VERSION_17
5151
}
5252
buildFeatures {
5353
compose = true

AdaptiveUiCodelab/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
androidGradlePlugin = "9.3.1"
3-
composeBom = "2026.06.01"
3+
composeBom = "2026.08.00"
44
coreKtx = "1.19.0"
55
activityCompose = "1.13.0"
66
espressoCore = "3.7.0"
@@ -9,7 +9,7 @@ junitVersion = "1.3.0"
99
kotlin = "2.3.10"
1010
kotlinxCoroutinesAndroid = "1.10.2"
1111
lifecycle = "2.11.0"
12-
material3Adaptive = "1.2.0"
12+
material3Adaptive = "1.3.0"
1313
material3AdaptiveNavSuite = "1.4.0"
1414
window = "1.5.1"
1515

-957 Bytes
Binary file not shown.

AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
44
networkTimeout=10000
55
retries=0
66
retryBackOffMs=500

0 commit comments

Comments
 (0)