Skip to content

Update all dependencies (end) #532

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
wants to merge 1 commit into
base: end
Choose a base branch
from
Open

Update all dependencies (end) #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -70,7 +70,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
def composeBom = platform('androidx.compose:compose-bom:2025.06.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -96,15 +96,15 @@ dependencies {

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

implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.activity:activity-ktx:1.10.1'
implementation 'androidx.core:core-ktx:1.16.0'
implementation "androidx.activity:activity-compose:1.10.1"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1"

implementation 'androidx.navigation:navigation-compose:2.9.0'

Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.10.0'
classpath 'com.android.tools.build:gradle:8.10.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
}
}

plugins {
id 'com.diffplug.spotless' version '7.0.3'
id 'com.diffplug.spotless' version '7.0.4'
id 'org.jetbrains.kotlin.plugin.compose' version "2.1.10" apply false
}

Expand Down
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-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 4 additions & 4 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[versions]
androidGradlePlugin = "8.10.0"
composeBom = "2025.05.00"
androidGradlePlugin = "8.10.1"
composeBom = "2025.06.00"
coreKtx = "1.16.0"
activityCompose = "1.10.1"
espressoCore = "3.6.1"
junit = "4.13.2"
junitVersion = "1.2.1"
kotlin = "2.1.10"
kotlinxCoroutinesAndroid = "1.10.1"
lifecycle = "2.9.0"
lifecycle = "2.9.1"
material3Adaptive = "1.1.0"
material3AdaptiveNavSuite = "1.3.2"
window = "1.3.0"
window = "1.4.0"

[libraries]
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
Expand Down
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-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
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 @@ -104,10 +104,10 @@ dependencies {
}

implementation "androidx.activity:activity-compose:1.10.1"
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.tracing:tracing:1.3.0"

def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
def composeBom = platform('androidx.compose:compose-bom:2025.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -121,7 +121,7 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-test-manifest"


def lifecycle_version = "2.9.0"
def lifecycle_version = "2.9.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
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 @@ -20,15 +20,15 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.10.0"
classpath "com.android.tools.build:gradle:8.10.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.56.2"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
}

plugins {
id 'com.diffplug.spotless' version '7.0.3'
id 'com.diffplug.spotless' version '7.0.4'
}

subprojects {
Expand Down
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-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ android {
}

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

Expand All @@ -72,7 +72,7 @@ dependencies {
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.12.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.1'
implementation 'androidx.activity:activity-compose:1.10.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.10.0"
classpath "com.android.tools.build:gradle:8.10.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
}

plugins {
id 'com.diffplug.spotless' version '7.0.3'
id 'com.diffplug.spotless' version '7.0.4'
}

subprojects {
Expand Down
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-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
10 changes: 5 additions & 5 deletions MigrationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@ android {
}

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

kapt "androidx.room:room-compiler:2.7.1"
kapt "com.github.bumptech.glide:compiler:4.16.0"
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.constraintlayout:constraintlayout:2.2.1"
implementation "androidx.core:core-ktx:1.16.0"
implementation "androidx.fragment:fragment-ktx:1.8.6"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0"
implementation "androidx.fragment:fragment-ktx:1.8.8"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1"
implementation "androidx.navigation:navigation-fragment-ktx:2.9.0"
implementation "androidx.navigation:navigation-ui-ktx:2.9.0"
implementation "androidx.recyclerview:recyclerview:1.4.0"
Expand Down
4 changes: 2 additions & 2 deletions MigrationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.10.0"
classpath "com.android.tools.build:gradle:8.10.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
}

plugins {
id 'com.diffplug.spotless' version '7.0.3'
id 'com.diffplug.spotless' version '7.0.4'
}

allprojects {
Expand Down
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-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions NavigationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.core:core-ktx:1.16.0"
implementation "com.google.android.material:material:1.12.0"

Expand All @@ -101,7 +101,7 @@ dependencies {

// Testing dependencies
androidTestImplementation "androidx.arch.core:core-testing:2.2.0"
androidTestImplementation "androidx.navigation:navigation-testing:2.8.9"
androidTestImplementation "androidx.navigation:navigation-testing:2.9.0"
androidTestImplementation "androidx.test.espresso:espresso-contrib:3.6.1"
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"

Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.10.0"
classpath "com.android.tools.build:gradle:8.10.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
}

plugins {
id 'com.diffplug.spotless' version '7.0.3'
id 'com.diffplug.spotless' version '7.0.4'
}

subprojects {
Expand Down
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-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
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 @@ -92,7 +92,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.8.1")
implementation("androidx.compose.runtime:runtime-tracing:1.8.2")

implementation(libs.coil.compose)
implementation(libs.androidx.media3.exoplayer)
Expand Down
14 changes: 7 additions & 7 deletions PerformanceCodelab/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[versions]
coil = "2.7.0"
com-android-application = "8.10.0"
com-android-application = "8.10.1"
desugar_jdk_libs = "2.1.5"
kotlinx-datetime = "0.6.1"
lifecycle-viewmodel-compose = "2.9.0"
lifecycle-viewmodel-compose = "2.9.1"
material-icons-core = "1.7.8"
media3 = "1.6.1"
media3 = "1.7.1"
org-jetbrains-kotlin-android = "2.1.10"
core-ktx = "1.16.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.2.1"
espresso-core = "3.6.1"
lifecycle-runtime-ktx = "2.9.0"
lifecycle-runtime-ktx = "2.9.1"
activity-compose = "1.10.1"
compose-bom = "2025.05.00"
runtime-tracing = "1.8.1"
compose-bom = "2025.06.00"
runtime-tracing = "1.8.2"
tracing-ktx = "1.3.0"
tracing-perfetto = "1.0.0"
uiautomator = "2.3.0"
benchmark = "1.3.4"
androidx-baselineprofile = "1.3.4"
profileinstaller = "1.4.1"
material3 = "1.3.2"
spotless = "7.0.3"
spotless = "7.0.4"
ktlint = "1.2.1"

[libraries]
Expand Down
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-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ android {
}

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

Expand Down
8 changes: 4 additions & 4 deletions TestingCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ buildscript {
targetSdkVersion = 33

// App dependencies
appCompatVersion = '1.7.0'
appCompatVersion = '1.7.1'
activityComposeVersion = '1.10.1'
coreTestingVersion = '2.2.0'
coroutinesVersion = "1.5.2"
espressoVersion = '3.6.1'
fragmentVersion = '1.8.6'
fragmentVersion = '1.8.8'
junitVersion = '4.13.1'
kotlinVersion = '2.1.10'
ktlintVersion = '0.48.2'
Expand All @@ -48,14 +48,14 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.10.0"
classpath "com.android.tools.build:gradle:8.10.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion"
}
}

plugins {
id 'com.diffplug.spotless' version '7.0.3'
id 'com.diffplug.spotless' version '7.0.4'
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/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-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading