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
4 changes: 2 additions & 2 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.01.01')
def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -123,7 +123,7 @@ dependencies {
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.6'
implementation 'androidx.navigation:navigation-compose:2.8.7'

androidTestImplementation 'androidx.test:rules:1.6.1'
androidTestImplementation 'androidx.test:runner:1.6.2'
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.8.0'
classpath 'com.android.tools.build:gradle:8.8.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
}
}
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
androidGradlePlugin = "8.8.0"
composeBom = "2025.01.01"
androidGradlePlugin = "8.8.1"
composeBom = "2025.02.00"
coreKtx = "1.15.0"
activityCompose = "1.10.0"
espressoCore = "3.6.1"
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.tracing:tracing:1.2.0"

def composeBom = platform('androidx.compose:compose-bom:2025.01.01')
def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/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.8.0"
classpath "com.android.tools.build:gradle:8.8.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.55"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
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.8.0'
classpath 'com.android.tools.build:gradle:8.8.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.10.0'
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/start/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.10.0'
Expand Down
2 changes: 1 addition & 1 deletion 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:2025.01.01')
def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/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.8.0"
classpath "com.android.tools.build:gradle:8.8.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
Expand Down
4 changes: 2 additions & 2 deletions BasicStateCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
implementation("androidx.activity:activity-compose:1.10.0")
implementation(platform("androidx.compose:compose-bom:2025.01.01"))
implementation(platform("androidx.compose:compose-bom:2025.02.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2025.01.01"))
androidTestImplementation(platform("androidx.compose:compose-bom:2025.02.00"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
2 changes: 1 addition & 1 deletion BasicStateCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.8.0'
classpath 'com.android.tools.build:gradle:8.8.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
Expand Down
4 changes: 2 additions & 2 deletions BasicsCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation("androidx.activity:activity-compose:1.10.0")
implementation(platform("androidx.compose:compose-bom:2025.01.01"))
implementation(platform("androidx.compose:compose-bom:2025.02.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
Expand All @@ -76,7 +76,7 @@ dependencies {
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2025.01.01"))
androidTestImplementation(platform("androidx.compose:compose-bom:2025.02.00"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
2 changes: 1 addition & 1 deletion BasicsCodelab/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.8.0" apply false
id("com.android.application") version "8.8.1" apply false
id("org.jetbrains.kotlin.android") version "2.1.10" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.1.10" apply false
}
10 changes: 5 additions & 5 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:2025.01.01')
def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -69,11 +69,11 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.constraintlayout:constraintlayout:2.2.0"
implementation "androidx.core:core-ktx:1.15.0"
implementation "androidx.fragment:fragment-ktx:1.8.5"
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.6"
implementation "androidx.navigation:navigation-ui-ktx:2.8.6"
implementation "androidx.navigation:navigation-fragment-ktx:2.8.7"
implementation "androidx.navigation:navigation-ui-ktx:2.8.7"
implementation "androidx.recyclerview:recyclerview:1.4.0"
implementation "androidx.room:room-runtime:2.6.1"
implementation "androidx.room:room-ktx:2.6.1"
Expand All @@ -82,7 +82,7 @@ dependencies {
implementation "androidx.work:work-runtime-ktx:2.10.0"
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.0"
implementation "com.google.code.gson:gson:2.12.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1"

Expand Down
4 changes: 2 additions & 2 deletions MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.8.0"
classpath "com.android.tools.build:gradle:8.8.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.6"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.7"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
}
Expand Down
2 changes: 1 addition & 1 deletion 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:2025.01.01')
def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.8.0"
classpath "com.android.tools.build:gradle:8.8.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
Expand Down
10 changes: 5 additions & 5 deletions PerformanceCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
coil = "2.7.0"
com-android-application = "8.8.0"
com-android-application = "8.8.1"
desugar_jdk_libs = "2.1.4"
kotlinx-datetime = "0.6.1"
lifecycle-viewmodel-compose = "2.8.7"
material-icons-core = "1.7.7"
material-icons-core = "1.7.8"
media3 = "1.5.1"
org-jetbrains-kotlin-android = "2.1.10"
core-ktx = "1.15.0"
Expand All @@ -13,9 +13,9 @@ androidx-test-ext-junit = "1.2.1"
espresso-core = "3.6.1"
lifecycle-runtime-ktx = "2.8.7"
activity-compose = "1.10.0"
compose-bom = "2025.01.01"
runtime-tracing = "1.7.7"
tracing-ktx = "1.3.0-alpha02"
compose-bom = "2025.02.00"
runtime-tracing = "1.7.8"
tracing-ktx = "1.3.0-beta01"
tracing-perfetto = "1.0.0"
uiautomator = "2.3.0"
benchmark = "1.3.3"
Expand Down
4 changes: 2 additions & 2 deletions TestingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ android {
}

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

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

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.8.0"
classpath "com.android.tools.build:gradle:8.8.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.01.01')
def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.8.0'
classpath 'com.android.tools.build:gradle:8.8.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelabM2/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.15.0'
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelabM2/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.8.0"
classpath "com.android.tools.build:gradle:8.8.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
}
Expand Down
Loading