From 71530710f83a05747fbe2564c570bd66825369f1 Mon Sep 17 00:00:00 2001 From: 985892345 Date: Sun, 8 Dec 2024 17:35:21 +0800 Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E5=8D=87=E7=BA=A7=E8=87=B3=20ko?= =?UTF-8?q?tlin2.1.0=20&=20=E5=8F=96=E6=B6=88=20toolchain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-logic/manager/build.gradle.kts | 7 ------- build-logic/plugin/cache/build.gradle.kts | 7 ------- build-logic/plugin/checker/build.gradle.kts | 6 ------ gradle/libs.versions.toml | 10 +++++----- lib_account/api_account/build.gradle.kts | 3 ++- lib_single/build.gradle.kts | 4 ++++ .../cyxbs/discover/news/utils/FileTypeHelper.kt | 2 +- 7 files changed, 12 insertions(+), 27 deletions(-) diff --git a/build-logic/manager/build.gradle.kts b/build-logic/manager/build.gradle.kts index 6d2c2f1982..ad009d1aea 100644 --- 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().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 index a173c0f59d..ee41335969 100644 --- 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().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 index e76ecfa8af..eb7b4cb7de 100644 --- 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().configureEach { - kotlinOptions { - jvmTarget = libs.versions.kotlinJvmTarget.get() - } -} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6df2b8cb79..031f263a35 100644 --- 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 index b3a04acb43..4f37fac997 100644 --- 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) } \ No newline at end of file diff --git a/lib_single/build.gradle.kts b/lib_single/build.gradle.kts index a6c7d10dca..d4db2b5825 100644 --- 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 index 1b3fc1c422..319fac9f83 100644 --- 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