Fix version update issues

simona-anomis · simona-anomis · commit 6201d502fd42 · 2026-01-15T10:44:57.000+01:00
diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts
@@ -72,8 +72,10 @@ android {
             isDebuggable = false
         }
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 
     compileOptions {
diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 /*
  * Copyright 2020 The Android Open Source Project
  *
@@ -61,8 +63,10 @@ android {
             )
         }
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 
     compileOptions {
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/article/PostContent.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/article/PostContent.kt
@@ -147,10 +147,7 @@ private fun PostMetadata(metadata: Metadata, modifier: Modifier = Modifier) {
             Text(
                 text = stringResource(
                     id = R.string.article_post_min_read,
-                    formatArgs = arrayOf(
-                        metadata.date,
-                        metadata.readTimeMinutes,
-                    ),
+                    metadata.date, metadata.readTimeMinutes,
                 ),
                 style = MaterialTheme.typography.bodySmall,
             )
@@ -174,18 +171,21 @@ private fun Paragraph(paragraph: Paragraph) {
                 textStyle = textStyle,
                 paragraphStyle = paragraphStyle,
             )
+
             ParagraphType.CodeBlock -> CodeBlockParagraph(
                 text = annotatedString,
                 textStyle = textStyle,
                 paragraphStyle = paragraphStyle,
             )
+
             ParagraphType.Header -> {
                 Text(
                     modifier = Modifier.padding(4.dp),
                     text = annotatedString,
                     style = textStyle.merge(paragraphStyle),
                 )
             }
+
             else -> Text(
                 modifier = Modifier.padding(4.dp),
                 text = annotatedString,
@@ -251,16 +251,20 @@ private fun ParagraphType.getTextAndParagraphStyle(): ParagraphStyling {
             textStyle = typography.headlineSmall
             trailingPadding = 16.dp
         }
+
         ParagraphType.Text -> {
             textStyle = typography.bodyLarge.copy(lineHeight = 28.sp)
         }
+
         ParagraphType.Header -> {
             textStyle = typography.headlineMedium
             trailingPadding = 16.dp
         }
+
         ParagraphType.CodeBlock -> textStyle = typography.bodyLarge.copy(
             fontFamily = FontFamily.Monospace,
         )
+
         ParagraphType.Quote -> textStyle = typography.bodyLarge
         ParagraphType.Bullet -> {
             paragraphStyle = ParagraphStyle(textIndent = TextIndent(firstLine = 8.sp))
@@ -288,20 +292,23 @@ fun Markup.toAnnotatedStringItem(typography: Typography, codeBlockBackground: Co
                 end,
             )
         }
+
         MarkupType.Link -> {
             AnnotatedString.Range(
                 typography.bodyLarge.copy(textDecoration = TextDecoration.Underline).toSpanStyle(),
                 start,
                 end,
             )
         }
+
         MarkupType.Bold -> {
             AnnotatedString.Range(
                 typography.bodyLarge.copy(fontWeight = FontWeight.Bold).toSpanStyle(),
                 start,
                 end,
             )
         }
+
         MarkupType.Code -> {
             AnnotatedString.Range(
                 typography.bodyLarge
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCardTop.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCardTop.kt
@@ -74,10 +74,8 @@ fun PostCardTop(post: Post, modifier: Modifier = Modifier) {
         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 = typography.bodySmall,
         )
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCardYourNetwork.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCardYourNetwork.kt
@@ -86,10 +86,8 @@ fun PostCardPopular(post: Post, navigateToArticle: (String) -> Unit, modifier: M
                 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.bodySmall,
                 )
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt
@@ -57,10 +57,8 @@ fun AuthorAndReadTime(post: Post, modifier: Modifier = Modifier) {
         Text(
             text = stringResource(
                 id = R.string.home_post_min_read,
-                formatArgs = arrayOf(
-                    post.metadata.author.name,
-                    post.metadata.readTimeMinutes,
-                ),
+                post.metadata.author.name,
+                post.metadata.readTimeMinutes,
             ),
             style = MaterialTheme.typography.bodyMedium,
         )
diff --git a/Jetcaster/core/data-testing/build.gradle.kts b/Jetcaster/core/data-testing/build.gradle.kts
@@ -51,8 +51,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 }
 dependencies {
diff --git a/Jetcaster/core/data/build.gradle.kts b/Jetcaster/core/data/build.gradle.kts
@@ -54,8 +54,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 }
 dependencies {
diff --git a/Jetcaster/core/designsystem/build.gradle.kts b/Jetcaster/core/designsystem/build.gradle.kts
@@ -56,8 +56,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 }
 
diff --git a/Jetcaster/core/domain-testing/build.gradle.kts b/Jetcaster/core/domain-testing/build.gradle.kts
@@ -46,8 +46,10 @@ android {
             )
         }
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
diff --git a/Jetcaster/core/domain/build.gradle.kts b/Jetcaster/core/domain/build.gradle.kts
@@ -48,8 +48,10 @@ android {
             )
         }
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
diff --git a/Jetcaster/glancewidget/build.gradle.kts b/Jetcaster/glancewidget/build.gradle.kts
@@ -47,8 +47,10 @@ android {
         compose = true
         buildConfig = true
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
diff --git a/Jetcaster/mobile/build.gradle.kts b/Jetcaster/mobile/build.gradle.kts
@@ -78,8 +78,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 
     buildFeatures {
diff --git a/Jetcaster/tv/build.gradle.kts b/Jetcaster/tv/build.gradle.kts
@@ -70,8 +70,10 @@ android {
             )
         }
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 
     compileOptions {
diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts
@@ -63,8 +63,10 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts
@@ -82,8 +82,10 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts
@@ -87,8 +87,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 
     buildFeatures {

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,10 @@ android {`
`72`	`72`	`isDebuggable = false`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`- kotlinOptions {`
`76`		`- jvmTarget = "17"`
	`75`	`+ kotlin {`
	`76`	`+ compilerOptions {`
	`77`	`+ jvmTarget = JvmTarget.fromTarget("17")`
	`78`	`+ }`
`77`	`79`	`}`
`78`	`80`
`79`	`81`	`compileOptions {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
	`2`	`+`
`1`	`3`	`/*`
`2`	`4`	`* Copyright 2020 The Android Open Source Project`
`3`	`5`	`*`
`@@ -61,8 +63,10 @@ android {`
`61`	`63`	`)`
`62`	`64`	`}`
`63`	`65`	`}`
`64`		`- kotlinOptions {`
`65`		`- jvmTarget = "17"`
	`66`	`+ kotlin {`
	`67`	`+ compilerOptions {`
	`68`	`+ jvmTarget = JvmTarget.fromTarget("17")`
	`69`	`+ }`
`66`	`70`	`}`
`67`	`71`
`68`	`72`	`compileOptions {`
Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,7 @@ private fun PostMetadata(metadata: Metadata, modifier: Modifier = Modifier) {`
`147`	`147`	`Text(`
`148`	`148`	`text = stringResource(`
`149`	`149`	`id = R.string.article_post_min_read,`
`150`		`- formatArgs = arrayOf(`
`151`		`- metadata.date,`
`152`		`- metadata.readTimeMinutes,`
`153`		`- ),`
	`150`	`+ metadata.date, metadata.readTimeMinutes,`
`154`	`151`	`),`
`155`	`152`	`style = MaterialTheme.typography.bodySmall,`
`156`	`153`	`)`
`@@ -174,18 +171,21 @@ private fun Paragraph(paragraph: Paragraph) {`
`174`	`171`	`textStyle = textStyle,`
`175`	`172`	`paragraphStyle = paragraphStyle,`
`176`	`173`	`)`
	`174`	`+`
`177`	`175`	`ParagraphType.CodeBlock -> CodeBlockParagraph(`
`178`	`176`	`text = annotatedString,`
`179`	`177`	`textStyle = textStyle,`
`180`	`178`	`paragraphStyle = paragraphStyle,`
`181`	`179`	`)`
	`180`	`+`
`182`	`181`	`ParagraphType.Header -> {`
`183`	`182`	`Text(`
`184`	`183`	`modifier = Modifier.padding(4.dp),`
`185`	`184`	`text = annotatedString,`
`186`	`185`	`style = textStyle.merge(paragraphStyle),`
`187`	`186`	`)`
`188`	`187`	`}`
	`188`	`+`
`189`	`189`	`else -> Text(`
`190`	`190`	`modifier = Modifier.padding(4.dp),`
`191`	`191`	`text = annotatedString,`
`@@ -251,16 +251,20 @@ private fun ParagraphType.getTextAndParagraphStyle(): ParagraphStyling {`
`251`	`251`	`textStyle = typography.headlineSmall`
`252`	`252`	`trailingPadding = 16.dp`
`253`	`253`	`}`
	`254`	`+`
`254`	`255`	`ParagraphType.Text -> {`
`255`	`256`	`textStyle = typography.bodyLarge.copy(lineHeight = 28.sp)`
`256`	`257`	`}`
	`258`	`+`
`257`	`259`	`ParagraphType.Header -> {`
`258`	`260`	`textStyle = typography.headlineMedium`
`259`	`261`	`trailingPadding = 16.dp`
`260`	`262`	`}`
	`263`	`+`
`261`	`264`	`ParagraphType.CodeBlock -> textStyle = typography.bodyLarge.copy(`
`262`	`265`	`fontFamily = FontFamily.Monospace,`
`263`	`266`	`)`
	`267`	`+`
`264`	`268`	`ParagraphType.Quote -> textStyle = typography.bodyLarge`
`265`	`269`	`ParagraphType.Bullet -> {`
`266`	`270`	`paragraphStyle = ParagraphStyle(textIndent = TextIndent(firstLine = 8.sp))`
`@@ -288,20 +292,23 @@ fun Markup.toAnnotatedStringItem(typography: Typography, codeBlockBackground: Co`
`288`	`292`	`end,`
`289`	`293`	`)`
`290`	`294`	`}`
	`295`	`+`
`291`	`296`	`MarkupType.Link -> {`
`292`	`297`	`AnnotatedString.Range(`
`293`	`298`	`typography.bodyLarge.copy(textDecoration = TextDecoration.Underline).toSpanStyle(),`
`294`	`299`	`start,`
`295`	`300`	`end,`
`296`	`301`	`)`
`297`	`302`	`}`
	`303`	`+`
`298`	`304`	`MarkupType.Bold -> {`
`299`	`305`	`AnnotatedString.Range(`
`300`	`306`	`typography.bodyLarge.copy(fontWeight = FontWeight.Bold).toSpanStyle(),`
`301`	`307`	`start,`
`302`	`308`	`end,`
`303`	`309`	`)`
`304`	`310`	`}`
	`311`	`+`
`305`	`312`	`MarkupType.Code -> {`
`306`	`313`	`AnnotatedString.Range(`
`307`	`314`	`typography.bodyLarge`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,10 @@ android {`
`51`	`51`	`sourceCompatibility = JavaVersion.VERSION_17`
`52`	`52`	`targetCompatibility = JavaVersion.VERSION_17`
`53`	`53`	`}`
`54`		`- kotlinOptions {`
`55`		`- jvmTarget = "17"`
	`54`	`+ kotlin {`
	`55`	`+ compilerOptions {`
	`56`	`+ jvmTarget = JvmTarget.fromTarget("17")`
	`57`	`+ }`
`56`	`58`	`}`
`57`	`59`	`}`
`58`	`60`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,10 @@ android {`
`54`	`54`	`sourceCompatibility = JavaVersion.VERSION_17`
`55`	`55`	`targetCompatibility = JavaVersion.VERSION_17`
`56`	`56`	`}`
`57`		`- kotlinOptions {`
`58`		`- jvmTarget = "17"`
	`57`	`+ kotlin {`
	`58`	`+ compilerOptions {`
	`59`	`+ jvmTarget = JvmTarget.fromTarget("17")`
	`60`	`+ }`
`59`	`61`	`}`
`60`	`62`	`}`
`61`	`63`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,10 @@ android {`
`56`	`56`	`targetCompatibility = JavaVersion.VERSION_17`
`57`	`57`	`}`
`58`	`58`
`59`		`- kotlinOptions {`
`60`		`- jvmTarget = "17"`
	`59`	`+ kotlin {`
	`60`	`+ compilerOptions {`
	`61`	`+ jvmTarget = JvmTarget.fromTarget("17")`
	`62`	`+ }`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,10 @@ android {`
`46`	`46`	`)`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`- kotlinOptions {`
`50`		`- jvmTarget = "17"`
	`49`	`+ kotlin {`
	`50`	`+ compilerOptions {`
	`51`	`+ jvmTarget = JvmTarget.fromTarget("17")`
	`52`	`+ }`
`51`	`53`	`}`
`52`	`54`	`compileOptions {`
`53`	`55`	`isCoreLibraryDesugaringEnabled = true`