Skip to content

Commit 38be0b9

Browse files
Update Kotlin Dependencies to v2.3.0 (main) (#557)
* Update Kotlin Dependencies to v2.3.0 * Fix version update issues --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Simona Milanovic <anomis@google.com>
1 parent 165b895 commit 38be0b9

17 files changed

Lines changed: 45 additions & 32 deletions

File tree

AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,8 @@ fun PostCardPopular(
171171
Text(
172172
text = stringResource(
173173
id = R.string.home_post_min_read,
174-
formatArgs = arrayOf(
175-
post.metadata.date,
176-
post.metadata.readTimeMinutes
177-
)
174+
post.metadata.date,
175+
post.metadata.readTimeMinutes
178176
),
179177
style = MaterialTheme.typography.bodyMedium
180178
)

AccessibilityCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ buildscript {
2222

2323
dependencies {
2424
classpath 'com.android.tools.build:gradle:8.13.2'
25-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
25+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
2626
}
2727
}
2828

2929
plugins {
3030
id 'com.diffplug.spotless' version '8.1.0'
31-
id 'org.jetbrains.kotlin.plugin.compose' version "2.2.21" apply false
31+
id 'org.jetbrains.kotlin.plugin.compose' version "2.3.0" apply false
3232
}
3333

3434
subprojects {

AdaptiveUiCodelab/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ activityCompose = "1.12.2"
66
espressoCore = "3.7.0"
77
junit = "4.13.2"
88
junitVersion = "1.3.0"
9-
kotlin = "2.2.21"
9+
kotlin = "2.3.0"
1010
kotlinxCoroutinesAndroid = "1.10.2"
1111
lifecycle = "2.10.0"
1212
window = "1.5.1"

AdvancedStateAndSideEffectsCodelab/app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,10 @@ dependencies {
123123
def lifecycle_version = "2.10.0"
124124
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
125125
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
126+
126127
implementation "com.google.dagger:hilt-android:2.57.2"
127128
kapt "com.google.dagger:hilt-compiler:2.57.2"
129+
kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
128130

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

@@ -138,4 +140,5 @@ dependencies {
138140
androidTestImplementation "com.google.dagger:hilt-android:2.57.2"
139141
androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.2"
140142
kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.2"
143+
kaptAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
141144
}

AdvancedStateAndSideEffectsCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ buildscript {
2121
}
2222
dependencies {
2323
classpath "com.android.tools.build:gradle:8.13.2"
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
2525
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2"
26-
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
26+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
2727
}
2828
}
2929

AnimationCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ buildscript {
2121
}
2222
dependencies {
2323
classpath 'com.android.tools.build:gradle:8.13.2'
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
25-
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
25+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
2626
}
2727
}
2828

BasicLayoutsCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ buildscript {
2121
}
2222
dependencies {
2323
classpath "com.android.tools.build:gradle:8.13.2"
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
25-
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
25+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
2626
}
2727
}
2828

BasicStateCodelab/app/build.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17+
18+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19+
1720
plugins {
1821
id("com.android.application")
1922
id("org.jetbrains.kotlin.android")
@@ -50,8 +53,11 @@ android {
5053
sourceCompatibility = JavaVersion.VERSION_1_8
5154
targetCompatibility = JavaVersion.VERSION_1_8
5255
}
53-
kotlinOptions {
54-
jvmTarget = "1.8"
56+
57+
kotlin {
58+
compilerOptions {
59+
jvmTarget = JvmTarget.JVM_1_8
60+
}
5561
}
5662
buildFeatures {
5763
compose = true

BasicStateCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ buildscript {
2121

2222
dependencies {
2323
classpath 'com.android.tools.build:gradle:8.13.2'
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21"
25-
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
25+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
2626
}
2727
}
2828

BasicsCodelab/app/build.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17+
18+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19+
1720
plugins {
1821
id("com.android.application")
1922
id("org.jetbrains.kotlin.android")
@@ -50,8 +53,11 @@ android {
5053
sourceCompatibility = JavaVersion.VERSION_1_8
5154
targetCompatibility = JavaVersion.VERSION_1_8
5255
}
53-
kotlinOptions {
54-
jvmTarget = "1.8"
56+
57+
kotlin {
58+
compilerOptions {
59+
jvmTarget = JvmTarget.JVM_1_8
60+
}
5561
}
5662
buildFeatures {
5763
compose = true

0 commit comments

Comments
 (0)