Skip to content

Commit e8ce596

Browse files
authored
Merge pull request #559 from android/renovate/main-all
Update all dependencies (main)
2 parents c32466f + 7c4eec7 commit e8ce596

File tree

79 files changed

+122
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+122
-205
lines changed

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

@@ -87,7 +86,7 @@ android {
8786
}
8887

8988
dependencies {
90-
def composeBom = platform('androidx.compose:compose-bom:2026.01.00')
89+
def composeBom = platform('androidx.compose:compose-bom:2026.01.01')
9190
implementation(composeBom)
9291
testImplementation(composeBom)
9392
androidTestImplementation(composeBom)
@@ -114,23 +113,23 @@ dependencies {
114113
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
115114

116115
implementation 'androidx.appcompat:appcompat:1.7.1'
117-
implementation 'androidx.activity:activity-ktx:1.12.2'
116+
implementation 'androidx.activity:activity-ktx:1.12.3'
118117
implementation 'androidx.core:core-ktx:1.17.0'
119-
implementation "androidx.activity:activity-compose:1.12.2"
118+
implementation "androidx.activity:activity-compose:1.12.3"
120119

121120
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
122121
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0"
123122
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.10.0"
124123
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0"
125124

126-
implementation 'androidx.navigation:navigation-compose:2.9.6'
125+
implementation 'androidx.navigation:navigation-compose:2.9.7'
127126

128127
androidTestImplementation 'androidx.test:rules:1.7.0'
129128
androidTestImplementation 'androidx.test:runner:1.7.0'
130129

131130
// TODO: Bump to latest after Espresso 3.5.0 goes stable
132131
// (due to https://github.com/robolectric/robolectric/issues/6593)
133-
testImplementation 'org.robolectric:robolectric:4.16'
132+
testImplementation 'org.robolectric:robolectric:4.16.1'
134133
}
135134

136135
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

2.35 KB
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

AccessibilityCodelab/gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AccessibilityCodelab/gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AdaptiveUiCodelab/app/build.gradle.kts

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

1717
plugins {
1818
alias(libs.plugins.android.application)
19-
alias(libs.plugins.kotlin.android)
2019
alias(libs.plugins.compose.compiler)
2120
}
2221

@@ -50,9 +49,6 @@ android {
5049
sourceCompatibility = JavaVersion.VERSION_1_8
5150
targetCompatibility = JavaVersion.VERSION_1_8
5251
}
53-
kotlinOptions {
54-
jvmTarget = "1.8"
55-
}
5652
buildFeatures {
5753
compose = true
5854
}

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"
2.35 KB
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

0 commit comments

Comments
 (0)