Merge pull request #2265 from DimensionDev/dependency/kotlin-2.4

update kotlin 2.4

Author: Tlaster

app/build.gradle.kts

@@ -245,6 +245,3 @@ kotlin {
     }
 }
 
-ktorfit {
-    compilerPluginVersion.set("2.3.4")
-}

app/src/main/java/dev/dimension/flare/ui/component/RssRichText.kt

@@ -482,9 +482,7 @@ private fun RichTextScope.RenderNode(
             context.builder.append(node.text())
         }
 
-        else -> {
-            Unit
-        }
+        else -> {}
     }
 }
 

app/src/main/java/dev/dimension/flare/ui/screen/compose/DraftBoxScreen.kt

@@ -149,9 +149,7 @@ private fun DraftBoxItem(
         enabled = item.status != UiDraftStatus.SENDING,
         leadingContent = {
             when (item.status) {
-                UiDraftStatus.DRAFT -> {
-                    Unit
-                }
+                UiDraftStatus.DRAFT -> {}
 
                 UiDraftStatus.FAILED -> {
                     FAIcon(

app/src/main/java/dev/dimension/flare/ui/screen/media/StatusMediaScreen.kt

@@ -1513,13 +1513,9 @@ private fun mediaViewerPresenter(
 
         fun shareMedia(data: UiMedia) {
             when (data) {
-                is UiMedia.Audio -> {
-                    Unit
-                }
+                is UiMedia.Audio -> {}
 
-                is UiMedia.Gif -> {
-                    Unit
-                }
+                is UiMedia.Gif -> {}
 
                 is UiMedia.Image -> {
                     scope.launch {
@@ -1531,9 +1527,7 @@ private fun mediaViewerPresenter(
                     }
                 }
 
-                is UiMedia.Video -> {
-                    Unit
-                }
+                is UiMedia.Video -> {}
             }
         }
 

app/src/main/java/dev/dimension/flare/ui/screen/settings/AiConfigScreen.kt

@@ -1104,9 +1104,7 @@ internal fun TranslationConfigScreen(onBack: () -> Unit) {
                             )
                         }
 
-                        TranslateProviderOption.GoogleWeb -> {
-                            Unit
-                        }
+                        TranslateProviderOption.GoogleWeb -> {}
                     }
                 }
             }

build-logic/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
     compileOnly("com.android.tools.build:gradle:9.2.1")
-    compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21")
+    compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.0")
     implementation("org.jlleitschuh.gradle:ktlint-gradle:14.2.0")
 }
 

build-logic/src/main/kotlin/dev/dimension/flare/buildlogic/FlareConventionSupport.kt

@@ -29,7 +29,7 @@ enum class FlarePlatform {
 }
 
 class FlareMultiplatformLibraryPlugin : Plugin<Project> {
-    override fun apply(target: Project) = Unit
+    override fun apply(target: Project) {}
 }
 
 class FlareAndroidApplicationPlugin : Plugin<Project> {
@@ -56,6 +56,9 @@ class FlareRootConventionsPlugin : Plugin<Project> {
                     }
                 }
             }
+            subproject.tasks.matching { it.name.startsWith("runKtlint") }.configureEach {
+                dependsOn(subproject.tasks.matching { it.name.startsWith("ksp") })
+            }
         }
     }
 }

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/ProfileHeader.kt

@@ -162,9 +162,7 @@ private fun ProfileHeaderSuccess(
             isMe.onSuccess {
                 if (!it) {
                     when (followButtonState) {
-                        is UiState.Error -> {
-                            Unit
-                        }
+                        is UiState.Error -> {}
 
                         is UiState.Loading -> {
                             PlatformFilledTonalButton(
@@ -382,9 +380,7 @@ private fun ProfileHeaderSuccess(
                     }
                 }
 
-                null -> {
-                    Unit
-                }
+                null -> {}
             }
             MatricesDisplay(
                 data = user.matrices,

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt

@@ -707,9 +707,7 @@ internal fun TranslationDisplayBadge(
                     )
                 }
 
-                TranslationDisplayState.Translated -> {
-                    Unit
-                }
+                TranslationDisplayState.Translated -> {}
 
                 TranslationDisplayState.Failed -> {
                     FAIcon(
@@ -720,9 +718,7 @@ internal fun TranslationDisplayBadge(
                     )
                 }
 
-                TranslationDisplayState.Hidden -> {
-                    Unit
-                }
+                TranslationDisplayState.Hidden -> {}
             }
         }
     }
@@ -942,9 +938,7 @@ internal fun StatusActions(
                                 }
 
                                 // nested group is not supported
-                                is ActionMenu.Group -> {
-                                    Unit
-                                }
+                                is ActionMenu.Group -> {}
 
                                 ActionMenu.Divider -> {
                                     PlatformDropdownMenuDivider()
@@ -979,9 +973,7 @@ internal fun StatusActions(
                 }
 
                 // divider is only supported in group
-                ActionMenu.Divider -> {
-                    Unit
-                }
+                ActionMenu.Divider -> {}
             }
         }
     }

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/UiTimelineComponent.kt

@@ -384,9 +384,7 @@ private fun UserContent(
                             )
                         }
 
-                        else -> {
-                            Unit
-                        }
+                        else -> {}
                     }
                 }
             }