File tree Expand file tree Collapse file tree
app/src/main/java/com/example/jetnews/ui/home
AdvancedStateAndSideEffectsCodelab
PerformanceCodelab/gradle Expand file tree Collapse file tree Original file line number Diff line number Diff 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 )
Original file line number Diff line number Diff 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
2929plugins {
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
3434subprojects {
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ activityCompose = "1.12.2"
66espressoCore = " 3.7.0"
77junit = " 4.13.2"
88junitVersion = " 1.3.0"
9- kotlin = " 2.2.21 "
9+ kotlin = " 2.3.0 "
1010kotlinxCoroutinesAndroid = " 1.10.2"
1111lifecycle = " 2.10.0"
1212window = " 1.5.1"
Original file line number Diff line number Diff 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}
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 1414 * limitations under the License.
1515 */
1616
17+
18+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19+
1720plugins {
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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 1414 * limitations under the License.
1515 */
1616
17+
18+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19+
1720plugins {
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
You can’t perform that action at this time.
0 commit comments