Skip to content
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
6 changes: 3 additions & 3 deletions AccessibilityCodelab/app/build.gradle
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:2024.12.01')
def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -97,9 +97,9 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"

implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.activity:activity-ktx:1.9.3'
implementation 'androidx.activity:activity-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.15.0'
implementation "androidx.activity:activity-compose:1.9.3"
implementation "androidx.activity:activity-compose:1.10.0"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7"
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.7.3'
classpath 'com.android.tools.build:gradle:8.8.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
}
}

plugins {
id 'com.diffplug.spotless' version '6.25.0'
id 'com.diffplug.spotless' version '7.0.2'
id 'org.jetbrains.kotlin.plugin.compose' version "2.1.0" 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.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions AccessibilityCodelab/gradlew

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

6 changes: 3 additions & 3 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]
androidGradlePlugin = "8.7.3"
composeBom = "2024.12.01"
androidGradlePlugin = "8.8.0"
composeBom = "2025.01.00"
coreKtx = "1.15.0"
activityCompose = "1.9.3"
activityCompose = "1.10.0"
espressoCore = "3.6.1"
junit = "4.13.2"
junitVersion = "1.2.1"
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
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.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions AdaptiveUiCodelab/gradlew

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

14 changes: 7 additions & 7 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ dependencies {
}
}

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

def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
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.53.1"
kapt "com.google.dagger:hilt-compiler:2.53.1"
implementation "com.google.dagger:hilt-android:2.55"
kapt "com.google.dagger:hilt-compiler:2.55"

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.9.0"
androidTestImplementation "com.google.dagger:hilt-android:2.53.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.53.1"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.53.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"
}
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.7.3"
classpath "com.android.tools.build:gradle:8.8.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.53.1"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.55"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
}
}

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

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.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions AdvancedStateAndSideEffectsCodelab/gradlew

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

4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/app/build.gradle
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:2024.12.01')
def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -73,7 +73,7 @@ dependencies {
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.9.3'
implementation 'androidx.activity:activity-compose:1.10.0'
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
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.7.3"
classpath "com.android.tools.build:gradle:8.8.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
}
}

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

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.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions BasicLayoutsCodelab/gradlew

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

4 changes: 2 additions & 2 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ android {
}

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

Expand All @@ -74,7 +74,7 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
implementation "androidx.navigation:navigation-fragment-ktx:2.8.5"
implementation "androidx.navigation:navigation-ui-ktx:2.8.5"
implementation "androidx.recyclerview:recyclerview:1.3.2"
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"
Expand Down
4 changes: 2 additions & 2 deletions MigrationCodelab/build.gradle
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.7.3"
classpath "com.android.tools.build:gradle:8.8.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
}
}

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

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
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.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions MigrationCodelab/gradlew

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

4 changes: 2 additions & 2 deletions NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ android {
}

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

Expand All @@ -95,7 +95,7 @@ dependencies {
implementation "androidx.compose.foundation:foundation"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.activity:activity-compose:1.9.3"
implementation "androidx.activity:activity-compose:1.10.0"
implementation "androidx.navigation:navigation-compose:2.8.5"
debugImplementation "androidx.compose.ui:ui-tooling"

Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/build.gradle
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.7.3"
classpath "com.android.tools.build:gradle:8.8.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
}
}

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

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
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.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions NavigationCodelab/gradlew

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

12 changes: 6 additions & 6 deletions PerformanceCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[versions]
coil = "2.7.0"
com-android-application = "8.7.3"
desugar_jdk_libs = "2.1.3"
com-android-application = "8.8.0"
desugar_jdk_libs = "2.1.4"
kotlinx-datetime = "0.6.1"
lifecycle-viewmodel-compose = "2.8.7"
material-icons-core = "1.7.6"
media3 = "1.5.0"
media3 = "1.5.1"
org-jetbrains-kotlin-android = "2.1.0"
core-ktx = "1.15.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.2.1"
espresso-core = "3.6.1"
lifecycle-runtime-ktx = "2.8.7"
activity-compose = "1.9.3"
compose-bom = "2024.12.01"
activity-compose = "1.10.0"
compose-bom = "2025.01.00"
runtime-tracing = "1.7.6"
tracing-ktx = "1.3.0-alpha02"
tracing-perfetto = "1.0.0"
Expand All @@ -22,7 +22,7 @@ benchmark = "1.3.3"
androidx-baselineprofile = "1.3.3"
profileinstaller = "1.4.1"
material3 = "1.3.1"
spotless = "6.25.0"
spotless = "7.0.2"
ktlint = "1.2.1"

[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.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions PerformanceCodelab/gradlew

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

2 changes: 1 addition & 1 deletion TestingCodelab/app/build.gradle
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:2024.12.01')
def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
Loading
Loading