Skip to content

Commit 593a5ca

Browse files
authored
Merge pull request #561 from android/renovate/end-all
Update all dependencies (end)
2 parents f4c898f + eecb0d2 commit 593a5ca

36 files changed

Lines changed: 83 additions & 98 deletions

AccessibilityCodelab/app/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
plugins {
1818
id 'com.android.application'
19-
id 'kotlin-android'
2019
id 'org.jetbrains.kotlin.plugin.compose'
2120
}
2221

@@ -70,7 +69,7 @@ android {
7069
}
7170

7271
dependencies {
73-
def composeBom = platform('androidx.compose:compose-bom:2026.01.00')
72+
def composeBom = platform('androidx.compose:compose-bom:2026.01.01')
7473
implementation(composeBom)
7574
testImplementation(composeBom)
7675
androidTestImplementation(composeBom)
@@ -97,23 +96,23 @@ dependencies {
9796
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
9897

9998
implementation 'androidx.appcompat:appcompat:1.7.1'
100-
implementation 'androidx.activity:activity-ktx:1.12.2'
99+
implementation 'androidx.activity:activity-ktx:1.12.3'
101100
implementation 'androidx.core:core-ktx:1.17.0'
102-
implementation "androidx.activity:activity-compose:1.12.2"
101+
implementation "androidx.activity:activity-compose:1.12.3"
103102

104103
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
105104
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0"
106105
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.10.0"
107106
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0"
108107

109-
implementation 'androidx.navigation:navigation-compose:2.9.6'
108+
implementation 'androidx.navigation:navigation-compose:2.9.7'
110109

111110
androidTestImplementation 'androidx.test:rules:1.7.0'
112111
androidTestImplementation 'androidx.test:runner:1.7.0'
113112

114113
// TODO: Bump to latest after Espresso 3.5.0 goes stable
115114
// (due to https://github.com/robolectric/robolectric/issues/6593)
116-
testImplementation 'org.robolectric:robolectric:4.16'
115+
testImplementation 'org.robolectric:robolectric:4.16.1'
117116
}
118117

119118
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {

AccessibilityCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ buildscript {
2121
}
2222

2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:8.13.2'
24+
classpath 'com.android.tools.build:gradle:9.0.0'
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
2626
}
2727
}
2828

2929
plugins {
30-
id 'com.diffplug.spotless' version '8.1.0'
30+
id 'com.diffplug.spotless' version '8.2.1'
3131
id 'org.jetbrains.kotlin.plugin.compose' version "2.3.0" apply false
3232
}
3333

718 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.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

AdaptiveUiCodelab/gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
androidGradlePlugin = "8.13.2"
3-
composeBom = "2026.01.00"
2+
androidGradlePlugin = "9.0.0"
3+
composeBom = "2026.01.01"
44
coreKtx = "1.17.0"
5-
activityCompose = "1.12.2"
5+
activityCompose = "1.12.3"
66
espressoCore = "3.7.0"
77
junit = "4.13.2"
88
junitVersion = "1.3.0"
718 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.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

AdvancedStateAndSideEffectsCodelab/app/build.gradle

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616

1717
plugins {
1818
id 'com.android.application'
19-
id 'kotlin-android'
20-
id 'kotlin-kapt'
21-
id 'dagger.hilt.android.plugin'
19+
id 'com.google.devtools.ksp'
2220
id 'org.jetbrains.kotlin.plugin.compose'
21+
id 'dagger.hilt.android.plugin'
2322
}
2423

2524
// Reads the Google maps key that is used in the AndroidManifest
@@ -29,6 +28,7 @@ if (rootProject.file("local.properties").exists()) {
2928
}
3029

3130
android {
31+
namespace "androidx.compose.samples.crane"
3232
compileSdkVersion 36
3333
namespace "androidx.compose.samples.crane"
3434
defaultConfig {
@@ -69,10 +69,6 @@ android {
6969
targetCompatibility JavaVersion.VERSION_1_8
7070
}
7171

72-
kotlinOptions {
73-
jvmTarget = "1.8"
74-
}
75-
7672
buildFeatures {
7773
compose true
7874

@@ -103,11 +99,11 @@ dependencies {
10399
}
104100
}
105101

106-
implementation "androidx.activity:activity-compose:1.12.2"
102+
implementation "androidx.activity:activity-compose:1.12.3"
107103
implementation "androidx.appcompat:appcompat:1.7.1"
108104
implementation "androidx.tracing:tracing:1.3.0"
109105

110-
def composeBom = platform('androidx.compose:compose-bom:2026.01.00')
106+
def composeBom = platform('androidx.compose:compose-bom:2026.01.01')
111107
implementation(composeBom)
112108
androidTestImplementation(composeBom)
113109
implementation "androidx.compose.runtime:runtime"
@@ -120,14 +116,14 @@ dependencies {
120116
debugImplementation "androidx.compose.ui:ui-tooling"
121117
debugImplementation "androidx.compose.ui:ui-test-manifest"
122118

123-
124119
def lifecycle_version = "2.10.0"
125120
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
126121
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
127122
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
128-
implementation "com.google.dagger:hilt-android:2.57.2"
129-
kapt "com.google.dagger:hilt-compiler:2.57.2"
130-
kapt "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0"
123+
124+
implementation "com.google.dagger:hilt-android:2.59.1"
125+
ksp "com.google.dagger:hilt-compiler:2.59.1"
126+
ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
131127

132128
implementation "io.coil-kt:coil-compose:2.7.0"
133129

@@ -138,8 +134,8 @@ dependencies {
138134
androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0"
139135
androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0"
140136
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
141-
androidTestImplementation "com.google.dagger:hilt-android:2.57.2"
142-
androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.2"
143-
kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.2"
144-
kaptAndroidTest "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0"
137+
androidTestImplementation "com.google.dagger:hilt-android:2.59.1"
138+
androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.1"
139+
kspAndroidTest "com.google.dagger:hilt-compiler:2.59.1"
140+
kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
145141
}

AdvancedStateAndSideEffectsCodelab/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath "com.android.tools.build:gradle:8.13.2"
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0"
25-
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2"
26-
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.0"
23+
classpath "com.android.tools.build:gradle:9.0.0"
24+
classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.1"
25+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
2726
}
2827
}
2928

3029
plugins {
31-
id 'com.diffplug.spotless' version '8.1.0'
30+
id 'com.diffplug.spotless' version '8.2.1'
31+
id 'com.google.devtools.ksp' version '2.3.4' apply false
3232
}
3333

3434
subprojects {
Binary file not shown.

0 commit comments

Comments
 (0)