From d3229f90d08c8977d39e5e9aa9ecf54a7aee997b Mon Sep 17 00:00:00 2001 From: xfy Date: Wed, 20 May 2026 14:47:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20US-001=20=E6=B8=85=E7=90=86=20Gradl?= =?UTF-8?q?e=20=E6=A0=B9=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=A7=BB=E9=99=A4=20KM?= =?UTF-8?q?P/CMP=20=E6=8F=92=E4=BB=B6=E5=92=8C=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - build.gradle.kts: 移除 composeMultiplatform、kotlinMultiplatform 插件 - settings.gradle.kts: 移除 JetBrains maven 仓库 - libs.versions.toml: CMP 依赖替换为 AndroidX Compose BOM - Licenses.kt: 更新依赖列表 Co-Authored-By: Claude Opus 4.7 (1M context) --- build.gradle.kts | 2 -- gradle/libs.versions.toml | 22 +++++++++---------- settings.gradle.kts | 1 - .../kotlin/plus/rua/project/ui/Licenses.kt | 15 ++++++------- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cf780d5..6a61282 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,5 @@ plugins { // in each subproject's classloader alias(libs.plugins.androidApplication) apply false alias(libs.plugins.androidLibrary) apply false - alias(libs.plugins.composeMultiplatform) apply false alias(libs.plugins.composeCompiler) apply false - alias(libs.plugins.kotlinMultiplatform) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 997fd04..0f9ee2e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ androidx-core = "1.18.0" androidx-espresso = "3.7.0" androidx-lifecycle = "2.10.0" androidx-testExt = "1.3.0" -composeMultiplatform = "1.11.0" +composeBom = "2025.05.01" junit = "4.13.2" kotlin = "2.3.21" material3 = "1.10.0-alpha05" @@ -20,24 +20,22 @@ sketch = "4.4.0" [libraries] kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } -androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } -androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } -compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" } -compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" } -compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" } -compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" } -compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "composeMultiplatform" } -compose-uiToolingPreview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "composeMultiplatform" } +androidx-lifecycle-viewmodelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } +androidx-lifecycle-runtimeCompose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } +compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" } +compose-runtime = { module = "androidx.compose.runtime:runtime" } +compose-foundation = { module = "androidx.compose.foundation:foundation" } +compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" } +compose-ui = { module = "androidx.compose.ui:ui" } +compose-uiTooling = { module = "androidx.compose.ui:ui-tooling" } +compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview" } kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.11.0" } tyme4kt = { module = "cn.6tail:tyme4kt", version.ref = "tyme4kt" } sketch-compose = { module = "io.github.panpf.sketch4:sketch-compose", version.ref = "sketch" } sketch-animated-gif = { module = "io.github.panpf.sketch4:sketch-animated-gif", version.ref = "sketch" } -sketch-compose-resources = { module = "io.github.panpf.sketch4:sketch-compose-resources", version.ref = "sketch" } [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" } androidLibrary = { id = "com.android.library", version.ref = "agp" } -composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" } composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index a48c555..7727015 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,7 +24,6 @@ dependencyResolutionManagement { includeGroupAndSubgroups("com.google") } } - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") mavenCentral() } } diff --git a/shared/src/commonMain/kotlin/plus/rua/project/ui/Licenses.kt b/shared/src/commonMain/kotlin/plus/rua/project/ui/Licenses.kt index 980b09c..b21e9ae 100644 --- a/shared/src/commonMain/kotlin/plus/rua/project/ui/Licenses.kt +++ b/shared/src/commonMain/kotlin/plus/rua/project/ui/Licenses.kt @@ -15,13 +15,12 @@ data class LicenseItem( * 项目使用的第三方库及其许可证列表。 */ val licenses = listOf( - LicenseItem("Kotlin", "Apache-2.0"), - LicenseItem("Compose Multiplatform", "Apache-2.0"), - LicenseItem("Material 3", "Apache-2.0"), - LicenseItem("kotlinx-datetime", "Apache-2.0"), - LicenseItem("tyme4kt", "MIT"), - LicenseItem("Sketch", "Apache-2.0"), - LicenseItem("AndroidX Activity", "Apache-2.0"), + LicenseItem("AndroidX Activity Compose", "Apache-2.0"), LicenseItem("AndroidX Lifecycle", "Apache-2.0"), - LicenseItem("JUnit", "EPL-1.0"), + LicenseItem("Compose Material 3", "Apache-2.0"), + LicenseItem("Compose Multiplatform", "Apache-2.0"), + LicenseItem("Kotlin", "Apache-2.0"), + LicenseItem("kotlinx-datetime", "Apache-2.0"), + LicenseItem("Sketch", "Apache-2.0"), + LicenseItem("tyme4kt", "MIT"), )