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
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,8 @@ fun PostCardPopular(
Text(
text = stringResource(
id = R.string.home_post_min_read,
formatArgs = arrayOf(
post.metadata.date,
post.metadata.readTimeMinutes
)
post.metadata.date,
post.metadata.readTimeMinutes
),
style = MaterialTheme.typography.bodyMedium
)
Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:8.13.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
}
}

plugins {
id 'com.diffplug.spotless' version '8.1.0'
id 'org.jetbrains.kotlin.plugin.compose' version "2.2.21" apply false
id 'org.jetbrains.kotlin.plugin.compose' version "2.3.0" apply false
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ activityCompose = "1.12.2"
espressoCore = "3.7.0"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.2.21"
kotlin = "2.3.0"
kotlinxCoroutinesAndroid = "1.10.2"
lifecycle = "2.10.0"
window = "1.5.1"
Expand Down
3 changes: 3 additions & 0 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,10 @@ dependencies {
def lifecycle_version = "2.10.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

implementation "com.google.dagger:hilt-android:2.57.2"
kapt "com.google.dagger:hilt-compiler:2.57.2"
kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"

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

Expand All @@ -138,4 +140,5 @@ dependencies {
androidTestImplementation "com.google.dagger:hilt-android:2.57.2"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.2"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.2"
kaptAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
}
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/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.13.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
}

Expand Down
4 changes: 2 additions & 2 deletions AnimationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.13.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
}

Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.13.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
}

Expand Down
10 changes: 8 additions & 2 deletions BasicStateCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
* limitations under the License.
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand Down Expand Up @@ -50,8 +53,11 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
}
buildFeatures {
compose = true
Expand Down
4 changes: 2 additions & 2 deletions BasicStateCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:8.13.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
}

Expand Down
10 changes: 8 additions & 2 deletions BasicsCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
* limitations under the License.
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand Down Expand Up @@ -50,8 +53,11 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
}
buildFeatures {
compose = true
Expand Down
4 changes: 2 additions & 2 deletions BasicsCodelab/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.13.2" apply false
id("org.jetbrains.kotlin.android") version "2.2.21" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.2.21" apply false
id("org.jetbrains.kotlin.android") version "2.3.0" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.3.0" apply false
}
4 changes: 2 additions & 2 deletions MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:8.13.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.6"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
}

Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:8.13.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion PerformanceCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kotlinx-datetime = "0.7.1-0.6.x-compat"
lifecycle-viewmodel-compose = "2.10.0"
material-icons-core = "1.7.8"
media3 = "1.9.0"
org-jetbrains-kotlin-android = "2.2.21"
org-jetbrains-kotlin-android = "2.3.0"
core-ktx = "1.17.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.3.0"
Expand Down
4 changes: 2 additions & 2 deletions TestingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:8.13.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
}

Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:8.13.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
}

Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelabM2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.13.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
}

Expand Down
Loading