diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts index edecdaccc..3b512329e 100644 --- a/JetLagged/app/build.gradle.kts +++ b/JetLagged/app/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) @@ -72,8 +74,10 @@ android { isDebuggable = false } } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } compileOptions { diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 7ae597f61..08ecfa53b 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] accompanist = "0.37.3" -android-material3 = "1.14.0-alpha07" -androidGradlePlugin = "8.13.1" -androidx-activity-compose = "1.12.1" +android-material3 = "1.14.0-alpha08" +androidGradlePlugin = "8.13.2" +androidx-activity-compose = "1.12.2" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.12.00" +androidx-compose-bom = "2026.01.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" @@ -28,24 +28,24 @@ coil = "2.7.0" # @keep compileSdk = "36" coroutines = "1.10.2" -google-maps = "19.2.0" +google-maps = "20.0.0" gradle-versions = "0.53.0" hilt = "2.57.2" hiltExt = "1.3.0" horologist = "0.7.15" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.2.21" +kotlin = "2.3.0" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" -ksp = "2.3.3" -maps-compose = "6.12.2" +ksp = "2.3.4" +maps-compose = "7.0.0" # @keep minSdk = "23" okhttp = "5.3.2" play-services-wearable = "19.0.0" robolectric = "4.16" -roborazzi = "1.52.0" +roborazzi = "1.56.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1" diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts index ed68fa47f..a962e86ca 100644 --- a/JetNews/app/build.gradle.kts +++ b/JetNews/app/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) @@ -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 index 88f273112..4412aa155 100644 --- 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,11 +171,13 @@ 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), @@ -186,6 +185,7 @@ private fun Paragraph(paragraph: Paragraph) { 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,6 +292,7 @@ fun Markup.toAnnotatedStringItem(typography: Typography, codeBlockBackground: Co end, ) } + MarkupType.Link -> { AnnotatedString.Range( typography.bodyLarge.copy(textDecoration = TextDecoration.Underline).toSpanStyle(), @@ -295,6 +300,7 @@ fun Markup.toAnnotatedStringItem(typography: Typography, codeBlockBackground: Co end, ) } + MarkupType.Bold -> { AnnotatedString.Range( typography.bodyLarge.copy(fontWeight = FontWeight.Bold).toSpanStyle(), @@ -302,6 +308,7 @@ fun Markup.toAnnotatedStringItem(typography: Typography, codeBlockBackground: Co 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 index 2c10daca6..dc16e4a87 100644 --- 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 index 2ac8b5209..5c8026f2a 100644 --- 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 index 69e94115a..6afdbd501 100644 --- 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/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index d64bd4605..cf10a7f86 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -4,11 +4,11 @@ ##### [versions] accompanist = "0.37.3" -android-material3 = "1.14.0-alpha07" -androidGradlePlugin = "8.13.1" -androidx-activity-compose = "1.12.1" +android-material3 = "1.14.0-alpha08" +androidGradlePlugin = "8.13.2" +androidx-activity-compose = "1.12.2" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.12.00" +androidx-compose-bom = "2026.01.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" @@ -32,24 +32,24 @@ coil = "2.7.0" # @keep compileSdk = "36" coroutines = "1.10.2" -google-maps = "19.2.0" +google-maps = "20.0.0" gradle-versions = "0.53.0" hilt = "2.57.2" hiltExt = "1.3.0" horologist = "0.7.15" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.2.21" +kotlin = "2.3.0" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" -ksp = "2.3.3" -maps-compose = "6.12.2" +ksp = "2.3.4" +maps-compose = "7.0.0" # @keep minSdk = "23" okhttp = "5.3.2" play-services-wearable = "19.0.0" robolectric = "4.16" -roborazzi = "1.52.0" +roborazzi = "1.56.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1" diff --git a/Jetcaster/core/data-testing/build.gradle.kts b/Jetcaster/core/data-testing/build.gradle.kts index 98c0f77a5..9ebec4c47 100644 --- a/Jetcaster/core/data-testing/build.gradle.kts +++ b/Jetcaster/core/data-testing/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -51,8 +53,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 index e308c6896..dfac84292 100644 --- a/Jetcaster/core/data/build.gradle.kts +++ b/Jetcaster/core/data/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -54,8 +56,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 index 0aa6e1fc3..eb0927bb9 100644 --- a/Jetcaster/core/designsystem/build.gradle.kts +++ b/Jetcaster/core/designsystem/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -56,8 +58,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 index 56cdb8f86..a712f923f 100644 --- a/Jetcaster/core/domain-testing/build.gradle.kts +++ b/Jetcaster/core/domain-testing/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -46,8 +48,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 index 4c28b5335..8efab558b 100644 --- a/Jetcaster/core/domain/build.gradle.kts +++ b/Jetcaster/core/domain/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -48,8 +50,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 index bebf465b9..1a4716310 100644 --- a/Jetcaster/glancewidget/build.gradle.kts +++ b/Jetcaster/glancewidget/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -47,8 +49,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 index c24b53c16..14eaa33a6 100644 --- a/Jetcaster/mobile/build.gradle.kts +++ b/Jetcaster/mobile/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) @@ -78,8 +80,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 index ba509ef74..40ebe5426 100644 --- a/Jetcaster/tv/build.gradle.kts +++ b/Jetcaster/tv/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) @@ -70,8 +72,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 index 2c7f5781a..1a37c1026 100644 --- a/Jetchat/app/build.gradle.kts +++ b/Jetchat/app/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) @@ -63,8 +65,10 @@ android { } } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index d64bd4605..cf10a7f86 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -4,11 +4,11 @@ ##### [versions] accompanist = "0.37.3" -android-material3 = "1.14.0-alpha07" -androidGradlePlugin = "8.13.1" -androidx-activity-compose = "1.12.1" +android-material3 = "1.14.0-alpha08" +androidGradlePlugin = "8.13.2" +androidx-activity-compose = "1.12.2" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.12.00" +androidx-compose-bom = "2026.01.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" @@ -32,24 +32,24 @@ coil = "2.7.0" # @keep compileSdk = "36" coroutines = "1.10.2" -google-maps = "19.2.0" +google-maps = "20.0.0" gradle-versions = "0.53.0" hilt = "2.57.2" hiltExt = "1.3.0" horologist = "0.7.15" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.2.21" +kotlin = "2.3.0" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" -ksp = "2.3.3" -maps-compose = "6.12.2" +ksp = "2.3.4" +maps-compose = "7.0.0" # @keep minSdk = "23" okhttp = "5.3.2" play-services-wearable = "19.0.0" robolectric = "4.16" -roborazzi = "1.52.0" +roborazzi = "1.56.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1" diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts index 8e2746048..02830b134 100644 --- a/Jetsnack/app/build.gradle.kts +++ b/Jetsnack/app/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) @@ -82,8 +84,10 @@ android { } } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index 14fa02d80..44f1cca7a 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] accompanist = "0.37.3" -android-material3 = "1.14.0-alpha07" -androidGradlePlugin = "8.13.1" -androidx-activity-compose = "1.12.1" +android-material3 = "1.14.0-alpha08" +androidGradlePlugin = "8.13.2" +androidx-activity-compose = "1.12.2" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.12.00" +androidx-compose-bom = "2026.01.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" @@ -29,24 +29,24 @@ coil = "2.7.0" compileSdk = "36" coroutines = "1.10.2" glancePreview = "1.1.1" -google-maps = "19.2.0" +google-maps = "20.0.0" gradle-versions = "0.53.0" hilt = "2.57.2" hiltExt = "1.3.0" horologist = "0.7.15" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.2.21" +kotlin = "2.3.0" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" -ksp = "2.3.3" -maps-compose = "6.12.2" +ksp = "2.3.4" +maps-compose = "7.0.0" # @keep minSdk = "23" okhttp = "5.3.2" play-services-wearable = "19.0.0" robolectric = "4.16" -roborazzi = "1.52.0" +roborazzi = "1.56.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1" diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts index 7207aa4ed..87ba9cf01 100644 --- a/Reply/app/build.gradle.kts +++ b/Reply/app/build.gradle.kts @@ -15,6 +15,8 @@ */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) @@ -87,8 +89,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } buildFeatures { diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index d64bd4605..cf10a7f86 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -4,11 +4,11 @@ ##### [versions] accompanist = "0.37.3" -android-material3 = "1.14.0-alpha07" -androidGradlePlugin = "8.13.1" -androidx-activity-compose = "1.12.1" +android-material3 = "1.14.0-alpha08" +androidGradlePlugin = "8.13.2" +androidx-activity-compose = "1.12.2" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.12.00" +androidx-compose-bom = "2026.01.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" @@ -32,24 +32,24 @@ coil = "2.7.0" # @keep compileSdk = "36" coroutines = "1.10.2" -google-maps = "19.2.0" +google-maps = "20.0.0" gradle-versions = "0.53.0" hilt = "2.57.2" hiltExt = "1.3.0" horologist = "0.7.15" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.2.21" +kotlin = "2.3.0" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" -ksp = "2.3.3" -maps-compose = "6.12.2" +ksp = "2.3.4" +maps-compose = "7.0.0" # @keep minSdk = "23" okhttp = "5.3.2" play-services-wearable = "19.0.0" robolectric = "4.16" -roborazzi = "1.52.0" +roborazzi = "1.56.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1"