Skip to content

Update all dependencies (main) #541

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.

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
merged 3 commits into from
Aug 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/AccessibilityCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
ls /dev/kvm

- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/AnimationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicLayoutsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicStateCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/MigrationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
ls /dev/kvm

- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/NavigationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/TestingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ThemingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
Expand Down
20 changes: 10 additions & 10 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace 'com.example.jetnews'
compileSdkVersion 35
compileSdkVersion 36
defaultConfig {
applicationId 'com.example.jetnews'
minSdkVersion 21
Expand Down Expand Up @@ -87,7 +87,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.06.01')
def composeBom = platform('androidx.compose:compose-bom:2025.08.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -115,18 +115,18 @@ dependencies {

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.core:core-ktx:1.17.0'
implementation "androidx.activity:activity-compose:1.10.1"

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.lifecycle:lifecycle-viewmodel-ktx:2.9.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2"

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

androidTestImplementation 'androidx.test:rules:1.6.1'
androidTestImplementation 'androidx.test:runner:1.6.2'
androidTestImplementation 'androidx.test:rules:1.7.0'
androidTestImplementation 'androidx.test:runner:1.7.0'

// TODO: Bump to latest after Espresso 3.5.0 goes stable
// (due to https://github.com/robolectric/robolectric/issues/6593)
Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/build.gradle
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.1'
classpath 'com.android.tools.build:gradle:8.12.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
}
}

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

Expand Down
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace = "com.example.reply"
compileSdk = 35
compileSdk = 36

defaultConfig {
applicationId = "com.example.reply"
Expand Down
12 changes: 6 additions & 6 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
androidGradlePlugin = "8.10.1"
composeBom = "2025.06.01"
coreKtx = "1.16.0"
androidGradlePlugin = "8.12.1"
composeBom = "2025.08.00"
coreKtx = "1.17.0"
activityCompose = "1.10.1"
espressoCore = "3.6.1"
espressoCore = "3.7.0"
junit = "4.13.2"
junitVersion = "1.2.1"
junitVersion = "1.3.0"
kotlin = "2.1.21"
kotlinxCoroutinesAndroid = "1.10.2"
lifecycle = "2.9.1"
lifecycle = "2.9.2"
window = "1.4.0"

[libraries]
Expand Down
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
26 changes: 13 additions & 13 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if (rootProject.file("local.properties").exists()) {

android {
namespace "androidx.compose.samples.crane"
compileSdkVersion 35
compileSdkVersion 36
defaultConfig {
applicationId "androidx.compose.samples.crane"
minSdkVersion 21
Expand Down Expand Up @@ -107,7 +107,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.tracing:tracing:1.3.0"

def composeBom = platform('androidx.compose:compose-bom:2025.06.01')
def composeBom = platform('androidx.compose:compose-bom:2025.08.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -120,22 +120,22 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"

def lifecycle_version = "2.9.1"
def lifecycle_version = "2.9.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.56.2"
kapt "com.google.dagger:hilt-compiler:2.56.2"
implementation "com.google.dagger:hilt-android:2.57"
kapt "com.google.dagger:hilt-compiler:2.57"

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

androidTestImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test:core:1.6.1"
androidTestImplementation "androidx.test:runner:1.6.2"
androidTestImplementation "androidx.test:rules:1.6.1"
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1"
androidTestImplementation "androidx.test:core:1.7.0"
androidTestImplementation "androidx.test:runner:1.7.0"
androidTestImplementation "androidx.test:rules:1.7.0"
androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0"
androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
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"
androidTestImplementation "com.google.dagger:hilt-android:2.57"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.57"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.57"
}
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
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.1"
classpath "com.android.tools.build:gradle:8.12.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.56.2"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
}

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

subprojects {
Expand Down
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.10.1'
classpath 'com.android.tools.build:gradle:8.12.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
Expand Down
6 changes: 3 additions & 3 deletions AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace "com.example.android.codelab.animation"
compileSdk 35
compileSdk 36
defaultConfig {
applicationId 'com.example.android.codelab.animation'
minSdkVersion 21
Expand All @@ -43,11 +43,11 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.06.01')
def composeBom = platform('androidx.compose:compose-bom:2025.08.00')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.10.1'
implementation 'androidx.core:core-ktx:1.16.0'
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions AnimationCodelab/start/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace "com.example.android.codelab.animation"
compileSdk 35
compileSdk 36
defaultConfig {
applicationId 'com.example.android.codelab.animation'
minSdkVersion 21
Expand All @@ -43,11 +43,11 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.06.01')
def composeBom = platform('androidx.compose:compose-bom:2025.08.00')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.10.1'
implementation 'androidx.core:core-ktx:1.16.0'
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
12 changes: 6 additions & 6 deletions BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace "com.codelab.basiclayouts"
compileSdk 35
compileSdk 36

defaultConfig {
applicationId "com.codelab.basiclayouts"
Expand Down Expand Up @@ -61,22 +61,22 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.16.0'
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.compose.ui:ui"
implementation 'androidx.compose.material3:material3'
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.9.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.2'
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'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
debugImplementation "androidx.compose.ui:ui-tooling"
}
Loading
Loading