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
2 changes: 1 addition & 1 deletion .github/workflows/AccessibilityCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- 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 @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

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

- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- 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 @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- 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 @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- 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 @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- 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 @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- 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 @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

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

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- 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 @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- 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 @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- 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 @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

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

android {
compileSdkVersion 36
compileSdkVersion 37
namespace 'com.example.jetnews'
defaultConfig {
applicationId 'com.example.jetnews'
Expand Down Expand Up @@ -69,7 +69,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.05.00')
def composeBom = platform('androidx.compose:compose-bom:2026.06.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -97,13 +97,13 @@ dependencies {

implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.activity:activity-ktx:1.13.0'
implementation 'androidx.core:core-ktx:1.18.0'
implementation 'androidx.core:core-ktx:1.19.0'
implementation "androidx.activity:activity-compose:1.13.0"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.10.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.11.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.11.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0"

implementation 'androidx.navigation:navigation-compose:2.9.8'

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

plugins {
id 'com.diffplug.spotless' version '8.4.0'
id 'com.diffplug.spotless' version '8.7.0'
id 'org.jetbrains.kotlin.plugin.compose' version "2.3.10" 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-9.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
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 @@ -21,7 +21,7 @@ plugins {

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

defaultConfig {
applicationId = "com.example.reply"
Expand Down
6 changes: 3 additions & 3 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
androidGradlePlugin = "9.2.1"
composeBom = "2026.05.00"
coreKtx = "1.18.0"
composeBom = "2026.06.00"
coreKtx = "1.19.0"
activityCompose = "1.13.0"
espressoCore = "3.7.0"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.3.10"
kotlinxCoroutinesAndroid = "1.10.2"
lifecycle = "2.10.0"
lifecycle = "2.11.0"
material3Adaptive = "1.2.0"
material3AdaptiveNavSuite = "1.4.0"
window = "1.5.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-9.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
10 changes: 5 additions & 5 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if (rootProject.file("local.properties").exists()) {

android {
namespace "androidx.compose.samples.crane"
compileSdkVersion 36
compileSdkVersion 37
namespace "androidx.compose.samples.crane"
defaultConfig {
applicationId "androidx.compose.samples.crane"
Expand Down Expand Up @@ -65,8 +65,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildFeatures {
Expand Down Expand Up @@ -103,7 +103,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.tracing:tracing:1.3.0"

def composeBom = platform('androidx.compose:compose-bom:2026.05.00')
def composeBom = platform('androidx.compose:compose-bom:2026.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -116,7 +116,7 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"

def lifecycle_version = "2.10.0"
def lifecycle_version = "2.11.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
Expand Down
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '8.4.0'
id 'com.google.devtools.ksp' version '2.3.7' apply false
id 'com.diffplug.spotless' version '8.7.0'
id 'com.google.devtools.ksp' version '2.3.9' apply false
}

subprojects {
Expand All @@ -50,7 +50,7 @@ subprojects {

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"

// Use experimental APIs
freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'
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-9.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
10 changes: 5 additions & 5 deletions BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
}

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

defaultConfig {
Expand Down Expand Up @@ -57,18 +57,18 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.18.0'
implementation 'androidx.core:core-ktx:1.19.0'
implementation "androidx.compose.ui:ui"
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material3:material3-window-size-class:1.4.0'
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.13.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.10.0'
implementation "com.google.android.material:material:1.14.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.11.0'
implementation 'androidx.activity:activity-compose:1.13.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '8.4.0'
id 'com.diffplug.spotless' version '8.7.0'
}

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-9.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
13 changes: 7 additions & 6 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apply plugin: 'com.android.legacy-kapt'


android {
compileSdkVersion 36
compileSdkVersion 37
namespace "com.google.samples.apps.sunflower"
defaultConfig {
applicationId "com.google.samples.apps.sunflower"
Expand Down Expand Up @@ -56,18 +56,19 @@ android {
}

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

kapt "androidx.room:room-compiler:2.8.4"
kapt "com.github.bumptech.glide:compiler:5.0.7"
kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.constraintlayout:constraintlayout:2.2.1"
implementation "androidx.core:core-ktx:1.18.0"
implementation "androidx.core:core-ktx:1.19.0"
implementation "androidx.fragment:fragment-ktx:1.8.9"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.10.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.11.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0"
implementation "androidx.navigation:navigation-fragment-ktx:2.9.8"
implementation "androidx.navigation:navigation-ui-ktx:2.9.8"
implementation "androidx.recyclerview:recyclerview:1.4.0"
Expand All @@ -77,7 +78,7 @@ dependencies {
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.11.2"
implementation "com.github.bumptech.glide:glide:5.0.7"
implementation "com.google.android.material:material:1.13.0"
implementation "com.google.android.material:material:1.14.0"
implementation "com.google.code.gson:gson:2.14.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '8.4.0'
id 'com.diffplug.spotless' version '8.7.0'
id 'com.android.legacy-kapt' version '9.2.1' apply false
}

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-9.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
8 changes: 4 additions & 4 deletions NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
}

android {
compileSdkVersion 36
compileSdkVersion 37
namespace "com.example.compose.rally"

defaultConfig {
Expand Down Expand Up @@ -76,13 +76,13 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.core:core-ktx:1.18.0"
implementation "com.google.android.material:material:1.13.0"
implementation "androidx.core:core-ktx:1.19.0"
implementation "com.google.android.material:material:1.14.0"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
Loading