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
10 changes: 5 additions & 5 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.02.00')
def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -114,16 +114,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
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
Binary file not shown.
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

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

8 changes: 4 additions & 4 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[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"
Expand Down
Binary file modified AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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

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
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 @@ -123,8 +123,8 @@ dependencies {
def lifecycle_version = "2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$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 @@ -135,7 +135,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
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 not shown.
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

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

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.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"
}
Expand Down
6 changes: 3 additions & 3 deletions AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.10.0'
implementation 'androidx.core:core-ktx:1.15.0'
implementation 'androidx.activity:activity-compose:1.10.1'
implementation 'androidx.core:core-ktx:1.16.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
Binary file modified AnimationCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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 AnimationCodelab/gradlew

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

6 changes: 3 additions & 3 deletions AnimationCodelab/start/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.10.0'
implementation 'androidx.core:core-ktx:1.15.0'
implementation 'androidx.activity:activity-compose:1.10.1'
implementation 'androidx.core:core-ktx:1.16.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
8 changes: 4 additions & 4 deletions BasicLayoutsCodelab/app/build.gradle
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,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
Binary file not shown.
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

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

8 changes: 4 additions & 4 deletions BasicStateCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,19 @@ android {
}

dependencies {
implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.core:core-ktx:1.16.0")
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.02.00"))
implementation("androidx.activity:activity-compose:1.10.1")
implementation(platform("androidx.compose:compose-bom:2025.04.01"))
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.02.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2025.04.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
4 changes: 2 additions & 2 deletions BasicStateCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,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 BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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 BasicStateCodelab/gradlew

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

8 changes: 4 additions & 4 deletions BasicsCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ android {
}

dependencies {
implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.core:core-ktx:1.16.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.02.00"))
implementation("androidx.activity:activity-compose:1.10.1")
implementation(platform("androidx.compose:compose-bom:2025.04.01"))
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.02.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2025.04.01"))
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.1" apply false
id("com.android.application") version "8.9.2" 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
}
Binary file modified BasicsCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion BasicsCodelab/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.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 BasicsCodelab/gradlew

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

Loading
Loading