Skip to content

Commit 30e3acd

Browse files
simona-anomissimona-anomis
authored
🤖 Update Dependencies (#1640)
Updated depedencies
2 parents a2e62eb + f1b1eda commit 30e3acd

File tree

22 files changed

+140
-87
lines changed

22 files changed

+140
-87
lines changed

‎JetLagged/app/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616

1717

18+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19+
1820
plugins {
1921
alias(libs.plugins.android.application)
2022
alias(libs.plugins.kotlin.android)
@@ -72,8 +74,10 @@ android {
7274
isDebuggable = false
7375
}
7476
}
75-
kotlinOptions {
76-
jvmTarget = "17"
77+
kotlin {
78+
compilerOptions {
79+
jvmTarget = JvmTarget.fromTarget("17")
80+
}
7781
}
7882

7983
compileOptions {

‎JetLagged/gradle/libs.versions.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[versions]
22
accompanist = "0.37.3"
3-
android-material3 = "1.14.0-alpha07"
4-
androidGradlePlugin = "8.13.1"
5-
androidx-activity-compose = "1.12.1"
3+
android-material3 = "1.14.0-alpha08"
4+
androidGradlePlugin = "8.13.2"
5+
androidx-activity-compose = "1.12.2"
66
androidx-appcompat = "1.7.1"
7-
androidx-compose-bom = "2025.12.00"
7+
androidx-compose-bom = "2026.01.00"
88
androidx-constraintlayout = "1.1.1"
99
androidx-core-splashscreen = "1.2.0"
1010
androidx-corektx = "1.17.0"
@@ -28,24 +28,24 @@ coil = "2.7.0"
2828
# @keep
2929
compileSdk = "36"
3030
coroutines = "1.10.2"
31-
google-maps = "19.2.0"
31+
google-maps = "20.0.0"
3232
gradle-versions = "0.53.0"
3333
hilt = "2.57.2"
3434
hiltExt = "1.3.0"
3535
horologist = "0.7.15"
3636
jdkDesugar = "2.1.5"
3737
junit = "4.13.2"
38-
kotlin = "2.2.21"
38+
kotlin = "2.3.0"
3939
kotlinx-serialization-json = "1.9.0"
4040
kotlinx_immutable = "0.4.0"
41-
ksp = "2.3.3"
42-
maps-compose = "6.12.2"
41+
ksp = "2.3.4"
42+
maps-compose = "7.0.0"
4343
# @keep
4444
minSdk = "23"
4545
okhttp = "5.3.2"
4646
play-services-wearable = "19.0.0"
4747
robolectric = "4.16"
48-
roborazzi = "1.52.0"
48+
roborazzi = "1.56.0"
4949
rome = "2.1.0"
5050
room = "2.8.4"
5151
secrets = "2.0.1"

‎JetNews/app/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616

1717

18+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19+
1820
plugins {
1921
alias(libs.plugins.android.application)
2022
alias(libs.plugins.kotlin.android)
@@ -61,8 +63,10 @@ android {
6163
)
6264
}
6365
}
64-
kotlinOptions {
65-
jvmTarget = "17"
66+
kotlin {
67+
compilerOptions {
68+
jvmTarget = JvmTarget.fromTarget("17")
69+
}
6670
}
6771

6872
compileOptions {

‎JetNews/app/src/main/java/com/example/jetnews/ui/article/PostContent.kt‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,7 @@ private fun PostMetadata(metadata: Metadata, modifier: Modifier = Modifier) {
147147
Text(
148148
text = stringResource(
149149
id = R.string.article_post_min_read,
150-
formatArgs = arrayOf(
151-
metadata.date,
152-
metadata.readTimeMinutes,
153-
),
150+
metadata.date, metadata.readTimeMinutes,
154151
),
155152
style = MaterialTheme.typography.bodySmall,
156153
)
@@ -174,18 +171,21 @@ private fun Paragraph(paragraph: Paragraph) {
174171
textStyle = textStyle,
175172
paragraphStyle = paragraphStyle,
176173
)
174+
177175
ParagraphType.CodeBlock -> CodeBlockParagraph(
178176
text = annotatedString,
179177
textStyle = textStyle,
180178
paragraphStyle = paragraphStyle,
181179
)
180+
182181
ParagraphType.Header -> {
183182
Text(
184183
modifier = Modifier.padding(4.dp),
185184
text = annotatedString,
186185
style = textStyle.merge(paragraphStyle),
187186
)
188187
}
188+
189189
else -> Text(
190190
modifier = Modifier.padding(4.dp),
191191
text = annotatedString,
@@ -251,16 +251,20 @@ private fun ParagraphType.getTextAndParagraphStyle(): ParagraphStyling {
251251
textStyle = typography.headlineSmall
252252
trailingPadding = 16.dp
253253
}
254+
254255
ParagraphType.Text -> {
255256
textStyle = typography.bodyLarge.copy(lineHeight = 28.sp)
256257
}
258+
257259
ParagraphType.Header -> {
258260
textStyle = typography.headlineMedium
259261
trailingPadding = 16.dp
260262
}
263+
261264
ParagraphType.CodeBlock -> textStyle = typography.bodyLarge.copy(
262265
fontFamily = FontFamily.Monospace,
263266
)
267+
264268
ParagraphType.Quote -> textStyle = typography.bodyLarge
265269
ParagraphType.Bullet -> {
266270
paragraphStyle = ParagraphStyle(textIndent = TextIndent(firstLine = 8.sp))
@@ -288,20 +292,23 @@ fun Markup.toAnnotatedStringItem(typography: Typography, codeBlockBackground: Co
288292
end,
289293
)
290294
}
295+
291296
MarkupType.Link -> {
292297
AnnotatedString.Range(
293298
typography.bodyLarge.copy(textDecoration = TextDecoration.Underline).toSpanStyle(),
294299
start,
295300
end,
296301
)
297302
}
303+
298304
MarkupType.Bold -> {
299305
AnnotatedString.Range(
300306
typography.bodyLarge.copy(fontWeight = FontWeight.Bold).toSpanStyle(),
301307
start,
302308
end,
303309
)
304310
}
311+
305312
MarkupType.Code -> {
306313
AnnotatedString.Range(
307314
typography.bodyLarge

‎JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCardTop.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,8 @@ fun PostCardTop(post: Post, modifier: Modifier = Modifier) {
7474
Text(
7575
text = stringResource(
7676
id = R.string.home_post_min_read,
77-
formatArgs = arrayOf(
78-
post.metadata.date,
79-
post.metadata.readTimeMinutes,
80-
),
77+
post.metadata.date,
78+
post.metadata.readTimeMinutes,
8179
),
8280
style = typography.bodySmall,
8381
)

‎JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCardYourNetwork.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,8 @@ fun PostCardPopular(post: Post, navigateToArticle: (String) -> Unit, modifier: M
8686
Text(
8787
text = stringResource(
8888
id = R.string.home_post_min_read,
89-
formatArgs = arrayOf(
90-
post.metadata.date,
91-
post.metadata.readTimeMinutes,
92-
),
89+
post.metadata.date,
90+
post.metadata.readTimeMinutes,
9391
),
9492
style = MaterialTheme.typography.bodySmall,
9593
)

‎JetNews/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
@@ -57,10 +57,8 @@ fun AuthorAndReadTime(post: Post, modifier: Modifier = Modifier) {
5757
Text(
5858
text = stringResource(
5959
id = R.string.home_post_min_read,
60-
formatArgs = arrayOf(
61-
post.metadata.author.name,
62-
post.metadata.readTimeMinutes,
63-
),
60+
post.metadata.author.name,
61+
post.metadata.readTimeMinutes,
6462
),
6563
style = MaterialTheme.typography.bodyMedium,
6664
)

‎JetNews/gradle/libs.versions.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#####
55
[versions]
66
accompanist = "0.37.3"
7-
android-material3 = "1.14.0-alpha07"
8-
androidGradlePlugin = "8.13.1"
9-
androidx-activity-compose = "1.12.1"
7+
android-material3 = "1.14.0-alpha08"
8+
androidGradlePlugin = "8.13.2"
9+
androidx-activity-compose = "1.12.2"
1010
androidx-appcompat = "1.7.1"
11-
androidx-compose-bom = "2025.12.00"
11+
androidx-compose-bom = "2026.01.00"
1212
androidx-constraintlayout = "1.1.1"
1313
androidx-core-splashscreen = "1.2.0"
1414
androidx-corektx = "1.17.0"
@@ -32,24 +32,24 @@ coil = "2.7.0"
3232
# @keep
3333
compileSdk = "36"
3434
coroutines = "1.10.2"
35-
google-maps = "19.2.0"
35+
google-maps = "20.0.0"
3636
gradle-versions = "0.53.0"
3737
hilt = "2.57.2"
3838
hiltExt = "1.3.0"
3939
horologist = "0.7.15"
4040
jdkDesugar = "2.1.5"
4141
junit = "4.13.2"
42-
kotlin = "2.2.21"
42+
kotlin = "2.3.0"
4343
kotlinx-serialization-json = "1.9.0"
4444
kotlinx_immutable = "0.4.0"
45-
ksp = "2.3.3"
46-
maps-compose = "6.12.2"
45+
ksp = "2.3.4"
46+
maps-compose = "7.0.0"
4747
# @keep
4848
minSdk = "23"
4949
okhttp = "5.3.2"
5050
play-services-wearable = "19.0.0"
5151
robolectric = "4.16"
52-
roborazzi = "1.52.0"
52+
roborazzi = "1.56.0"
5353
rome = "2.1.0"
5454
room = "2.8.4"
5555
secrets = "2.0.1"

‎Jetcaster/core/data-testing/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616

1717

18+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19+
1820
plugins {
1921
alias(libs.plugins.android.library)
2022
alias(libs.plugins.kotlin.android)
@@ -51,8 +53,10 @@ android {
5153
sourceCompatibility = JavaVersion.VERSION_17
5254
targetCompatibility = JavaVersion.VERSION_17
5355
}
54-
kotlinOptions {
55-
jvmTarget = "17"
56+
kotlin {
57+
compilerOptions {
58+
jvmTarget = JvmTarget.fromTarget("17")
59+
}
5660
}
5761
}
5862
dependencies {

‎Jetcaster/core/data/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616

1717

18+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19+
1820
plugins {
1921
alias(libs.plugins.android.library)
2022
alias(libs.plugins.kotlin.android)
@@ -54,8 +56,10 @@ android {
5456
sourceCompatibility = JavaVersion.VERSION_17
5557
targetCompatibility = JavaVersion.VERSION_17
5658
}
57-
kotlinOptions {
58-
jvmTarget = "17"
59+
kotlin {
60+
compilerOptions {
61+
jvmTarget = JvmTarget.fromTarget("17")
62+
}
5963
}
6064
}
6165
dependencies {

0 commit comments

Comments
 (0)