⬆️ 升级至 kotlin2.1.0 & 取消 toolchain

RedrockMobile · Dec 8, 2024 · 7153071 · 7153071
1 parent b5bf2cb
commit 7153071
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 27 deletions.
diff --git a/build-logic/manager/build.gradle.kts b/build-logic/manager/build.gradle.kts
@@ -2,13 +2,6 @@ plugins {
   `kotlin-dsl`
 }
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(libs.versions.javaTarget.get()))
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-  kotlinOptions {
-    jvmTarget = libs.versions.kotlinJvmTarget.get()
-  }
-}
-
 dependencies {
   implementation(projects.plugin.checker)
 

diff --git a/build-logic/plugin/cache/build.gradle.kts b/build-logic/plugin/cache/build.gradle.kts
@@ -12,13 +12,6 @@ gradlePlugin {
     }
 }
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(libs.versions.javaTarget.get()))
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = libs.versions.kotlinJvmTarget.get()
-    }
-}
-
 dependencies {
     implementation(libs.android.gradlePlugin)
     implementation(libs.kotlin.gradlePlugin)

diff --git a/build-logic/plugin/checker/build.gradle.kts b/build-logic/plugin/checker/build.gradle.kts
@@ -1,9 +1,3 @@
 plugins {
   `kotlin-dsl`
 }
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(libs.versions.javaTarget.get()))
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-  kotlinOptions {
-    jvmTarget = libs.versions.kotlinJvmTarget.get()
-  }
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ kotlinJvmTarget = "11"
 ####################################################################################################
 #                                            Android
 ####################################################################################################
-agp = "8.7.2"
+agp = "8.7.3"
 android-compileSdk = "35"
 android-minSdk = "24"
 android-targetSdk = "35"
@@ -42,7 +42,7 @@ androidx-fragment-ktx = "1.8.5"
 # https://developer.android.com/jetpack/androidx/releases/activity
 androidx-activity-ktx = "1.9.3"
 # https://mvnrepository.com/artifact/androidx.databinding/databinding-runtime
-androidx-databinding = "8.7.2"
+androidx-databinding = "8.7.3"
 # https://developer.android.com/jetpack/androidx/releases/paging
 androidx-paging = "3.3.4"
 # https://developer.android.com/jetpack/androidx/releases/room
@@ -75,7 +75,7 @@ lottie = "6.6.0"
 photoView = "2.3.0"
 # https://github.com/985892345/NetLayout
 # 20 级郭祥瑞封装的课表底层控件，如果有问题，欢迎来联系 👀
-netLayout = "1.1.1-SNAPSHOT"
+netLayout = "1.1.2"
 # https://github.com/985892345/SlideShow
 # 20 级郭祥瑞封装的 Banner 库，如果有问题，欢迎来联系 👀
 slideShow = "2.0.1"
@@ -94,9 +94,9 @@ wheelView = "4.1.9"
 #                                              Kotlin
 ####################################################################################################
 # https://github.com/JetBrains/kotlin/releases
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 # https://github.com/google/ksp/releases
-ksp = "2.0.21-1.0.26" # ksp 版本与 kotlin 版本强绑定，升级 kotlin 记得去更 ksp
+ksp = "2.1.0-1.0.29" # ksp 版本与 kotlin 版本强绑定，升级 kotlin 记得去更 ksp
 # https://github.com/Kotlin/kotlinx.coroutines
 kotlinx-coroutines = "1.9.0"
 # https://github.com/Kotlin/kotlinx.collections.immutable

diff --git a/lib_account/api_account/build.gradle.kts b/lib_account/api_account/build.gradle.kts
@@ -2,7 +2,8 @@ plugins {
   id("manager.library")
 }
 
+useARouter()
+
 dependencies {
   implementation(libs.rxjava)
-  implementation(libs.arouter)
 }
diff --git a/lib_single/build.gradle.kts b/lib_single/build.gradle.kts
@@ -3,6 +3,10 @@ plugins {
 }
 
 useARouter(false)
+useDataBinding() // dataBinding 需要进行模块依赖之间的传递，所以需要开启
+// 比如 A -> B -> C
+// A 和 C 都开启了 dataBinding，则 B 模块也必须开启才能正常注册 C 模块的 dataBinding
+// module_single 模块作为中间者即使没有使用也需要开启 dataBinding
 
 dependencies {
   implementation(projects.libBase)

diff --git a/module_news/src/main/java/com/mredrock/cyxbs/discover/news/utils/FileTypeHelper.kt b/module_news/src/main/java/com/mredrock/cyxbs/discover/news/utils/FileTypeHelper.kt
@@ -32,7 +32,7 @@ object FileTypeHelper {
             return type
         }
 
-        val end = fName.substring(dotIndex, fName.length).toLowerCase(Locale.getDefault())
+        val end = fName.substring(dotIndex, fName.length).lowercase()
         if (end.isBlank()) return type
         type = MIME_TABLE[end] ?: return type
         return type