Skip to content

Update all dependencies (end) #527

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

Merged
dturner merged 1 commit into from
Apr 24, 2025
Merged

Update all dependencies (end) #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 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.02.00')
def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -97,16 +97,16 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"

implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.activity:activity-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.15.0'
implementation "androidx.activity:activity-compose:1.10.0"
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.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7"

implementation 'androidx.navigation:navigation-compose:2.8.7'
implementation 'androidx.navigation:navigation-compose:2.8.9'

androidTestImplementation 'androidx.test:rules:1.6.1'
androidTestImplementation 'androidx.test:runner:1.6.2'
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.8.1'
classpath 'com.android.tools.build:gradle:8.9.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
}
}

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

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-8.12.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[versions]
androidGradlePlugin = "8.8.1"
composeBom = "2025.02.00"
coreKtx = "1.15.0"
activityCompose = "1.10.0"
androidGradlePlugin = "8.9.2"
composeBom = "2025.04.01"
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.8.7"
material3Adaptive = "1.0.0"
material3AdaptiveNavSuite = "1.3.1"
material3Adaptive = "1.1.0"
material3AdaptiveNavSuite = "1.3.2"
window = "1.3.0"

[libraries]
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-8.12.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ dependencies {
}
}

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

def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -125,8 +125,8 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.55"
kapt "com.google.dagger:hilt-compiler:2.55"
implementation "com.google.dagger:hilt-android:2.56.2"
kapt "com.google.dagger:hilt-compiler:2.56.2"

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

Expand All @@ -137,7 +137,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1"
androidTestImplementation "com.google.dagger:hilt-android:2.55"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.55"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.55"
androidTestImplementation "com.google.dagger:hilt-android:2.56.2"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.56.2"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.56.2"
}
6 changes: 3 additions & 3 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.8.1"
classpath "com.android.tools.build:gradle:8.9.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.55"
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.2'
id 'com.diffplug.spotless' version '7.0.3'
}

subprojects {
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-8.12.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions BasicLayoutsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.15.0'
implementation 'androidx.core:core-ktx:1.16.0'
implementation "androidx.compose.ui:ui"
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material3:material3-window-size-class:1.3.1'
implementation 'androidx.compose.material3:material3-window-size-class:1.3.2'
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.8.7'
implementation 'androidx.activity:activity-compose:1.10.0'
implementation 'androidx.activity:activity-compose:1.10.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.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.8.1"
classpath "com.android.tools.build:gradle:8.9.2"
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.2'
id 'com.diffplug.spotless' version '7.0.3'
}

subprojects {
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-8.12.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions MigrationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,29 @@ android {
}

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

kapt "androidx.room:room-compiler:2.6.1"
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.constraintlayout:constraintlayout:2.2.0"
implementation "androidx.core:core-ktx:1.15.0"
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.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
implementation "androidx.navigation:navigation-fragment-ktx:2.8.7"
implementation "androidx.navigation:navigation-ui-ktx:2.8.7"
implementation "androidx.navigation:navigation-fragment-ktx:2.8.9"
implementation "androidx.navigation:navigation-ui-ktx:2.8.9"
implementation "androidx.recyclerview:recyclerview:1.4.0"
implementation "androidx.room:room-runtime:2.6.1"
implementation "androidx.room:room-ktx:2.6.1"
implementation "androidx.tracing:tracing:1.2.0"
implementation "androidx.room:room-runtime:2.7.1"
implementation "androidx.room:room-ktx:2.7.1"
implementation "androidx.tracing:tracing:1.3.0"
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.10.0"
implementation "androidx.work:work-runtime-ktx:2.10.1"
implementation "com.github.bumptech.glide:glide:4.16.0"
implementation "com.google.android.material:material:1.12.0"
implementation "com.google.code.gson:gson:2.12.1"
implementation "com.google.code.gson:gson:2.13.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1"

Expand All @@ -103,7 +103,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-intents:3.6.1"
androidTestImplementation "androidx.test.ext:junit:1.2.1"
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0"
androidTestImplementation "androidx.work:work-testing:2.10.0"
androidTestImplementation "androidx.work:work-testing:2.10.1"
androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1"
androidTestImplementation "com.google.truth:truth:1.4.4"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
Expand Down
6 changes: 3 additions & 3 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.8.1"
classpath "com.android.tools.build:gradle:8.9.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.7"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.9"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
}

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

allprojects {
Expand Down
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-8.12.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions NavigationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ android {
}

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

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

// Compose
Expand All @@ -95,13 +95,13 @@ dependencies {
implementation "androidx.compose.foundation:foundation"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.activity:activity-compose:1.10.0"
implementation "androidx.navigation:navigation-compose:2.8.7"
implementation "androidx.activity:activity-compose:1.10.1"
implementation "androidx.navigation:navigation-compose:2.8.9"
debugImplementation "androidx.compose.ui:ui-tooling"

// Testing dependencies
androidTestImplementation "androidx.arch.core:core-testing:2.2.0"
androidTestImplementation "androidx.navigation:navigation-testing:2.8.7"
androidTestImplementation "androidx.navigation:navigation-testing:2.8.9"
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.8.1"
classpath "com.android.tools.build:gradle:8.9.2"
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.2'
id 'com.diffplug.spotless' version '7.0.3'
}

subprojects {
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-8.12.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.7.8")
implementation("androidx.compose.runtime:runtime-tracing:1.8.0")

implementation(libs.coil.compose)
implementation(libs.androidx.media3.exoplayer)
Expand Down
Loading