Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions JetLagged/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -72,8 +74,10 @@ android {
isDebuggable = false
}
}
kotlinOptions {
jvmTarget = "17"
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget("17")
}
}

compileOptions {
Expand Down
18 changes: 9 additions & 9 deletions JetLagged/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This is a major version update for google-maps (from 19.2.0 to 20.0.0). Major updates can introduce breaking changes. It's crucial to verify that the application still works as expected and to check the library's release notes for any necessary code migrations, especially since no related code changes are included in this PR.

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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The Kotlin version is being updated from 2.2.21 to 2.3.0. While this is a minor version update, it's good practice to review the Kotlin 2.3.0 changelog for any notable changes, deprecations, or new features that could affect the project or offer opportunities for improvement.

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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This is a major version update for maps-compose (from 6.12.2 to 7.0.0). Major updates often come with breaking changes. Please consult the release notes for migration guides and ensure all map-related features are tested thoroughly. The absence of related code changes suggests that either the update is non-breaking or migration steps are still needed.

# @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"
Expand Down
8 changes: 6 additions & 2 deletions JetNews/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -61,8 +63,10 @@ android {
)
}
}
kotlinOptions {
jvmTarget = "17"
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget("17")
}
}

compileOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand All @@ -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,
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
18 changes: 9 additions & 9 deletions JetNews/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This is a major version update for google-maps (from 19.2.0 to 20.0.0). Major updates can introduce breaking changes. It's crucial to verify that the application still works as expected and to check the library's release notes for any necessary code migrations, especially since no related code changes are included in this PR.

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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The Kotlin version is being updated from 2.2.21 to 2.3.0. While this is a minor version update, it's good practice to review the Kotlin 2.3.0 changelog for any notable changes, deprecations, or new features that could affect the project or offer opportunities for improvement.

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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This is a major version update for maps-compose (from 6.12.2 to 7.0.0). Major updates often come with breaking changes. Please consult the release notes for migration guides and ensure all map-related features are tested thoroughly. The absence of related code changes suggests that either the update is non-breaking or migration steps are still needed.

# @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"
Expand Down
8 changes: 6 additions & 2 deletions Jetcaster/core/data-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -51,8 +53,10 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget("17")
}
}
}
dependencies {
Expand Down
8 changes: 6 additions & 2 deletions Jetcaster/core/data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -54,8 +56,10 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget("17")
}
}
}
dependencies {
Expand Down
8 changes: 6 additions & 2 deletions Jetcaster/core/designsystem/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -56,8 +58,10 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "17"
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget("17")
}
}
}

Expand Down
8 changes: 6 additions & 2 deletions Jetcaster/core/domain-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -46,8 +48,10 @@ android {
)
}
}
kotlinOptions {
jvmTarget = "17"
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget("17")
}
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
Expand Down
8 changes: 6 additions & 2 deletions Jetcaster/core/domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -48,8 +50,10 @@ android {
)
}
}
kotlinOptions {
jvmTarget = "17"
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget("17")
}
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
Expand Down
8 changes: 6 additions & 2 deletions Jetcaster/glancewidget/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/


import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -47,8 +49,10 @@ android {
compose = true
buildConfig = true
}
kotlinOptions {
jvmTarget = "17"
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget("17")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
Expand Down
Loading
Loading