Skip to content

Commit e09a46c

Browse files
committed
依赖更新和设置优化
- 更新Kotlin从2.0.0到2.0.20,以获取最新的bug修复和性能改进。 - 将Compose插件更新到1.6.11,以与Kotlin更新保持一致并解锁新功能。 - 移除不必要的对JetBrains Compose库的依赖,以简化依赖管理。 - 重构`build.gradle.kts`和`settings.gradle.kts`中的部分配置,以提高可读性和维护性。 - 更新Android SDK和一些Android支持库,以利用最新的平台功能和安全补丁。 此更改集合提供了性能改进、bug修复以及开发工作流的几个优化,为将来的功能和维护奠定了坚实的基础。
1 parent f740f91 commit e09a46c

File tree

4 files changed

+29
-13
lines changed

4 files changed

+29
-13
lines changed

composeApp/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ kotlin {
3535
sourceSets {
3636

3737
androidMain.dependencies {
38-
implementation(project.dependencies.platform(libs.compose.bom))
3938
implementation(libs.androidx.activity.compose)
4039

4140
implementation(libs.koin.androidx.compose)

gradle/libs.versions.toml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,24 @@ app-code = "1"
33
app-name = "1.0.1"
44
app-packageName = "io.github.vrcmteam.vrcm"
55
agp = "8.2.2"
6-
kotlin = "2.0.0"
7-
kotlinx-coroutines-swing = "1.8.1"
8-
kotlinx-datetime = "0.6.0"
9-
android-minSdk = "24"
106
android-compileSdk = "34"
7+
android-minSdk = "24"
118
android-targetSdk = "34"
129
androidx-activityCompose = "1.9.1"
10+
androidx-appcompat = "1.7.0"
11+
androidx-constraintlayout = "2.1.4"
12+
androidx-core-ktx = "1.13.1"
13+
androidx-espresso-core = "3.6.1"
14+
androidx-lifecycle = "2.8.0"
15+
androidx-material = "1.12.0"
16+
androidx-test-junit = "1.2.1"
17+
compose-plugin = "1.6.11"
18+
junit = "4.13.2"
19+
kotlin = "2.0.20"
20+
kotlinx-coroutines-swing = "1.8.1"
21+
kotlinx-datetime = "0.6.0"
1322
multiplatform-settings = "1.1.1"
1423
jetpack-compose-bom = "2024.08.00"
15-
compose-plugin = "1.6.11"
1624
koin = "3.6.0-wasm-alpha2"
1725
stately-common = "2.0.6"
1826
voyager = "1.1.0-alpha03"
@@ -61,10 +69,9 @@ coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor", version.ref
6169
chrisbanes-haze = { module = "dev.chrisbanes.haze:haze", version.ref = "chrisbanes-haze" }
6270

6371
[plugins]
72+
androidApplication = { id = "com.android.application", version.ref = "agp" }
6473
androidLibrary = { id = "com.android.library", version.ref = "agp" }
65-
kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
6674
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
6775
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
68-
androidApplication = { id = "com.android.application", version.ref = "agp" }
6976
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
7077
kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

settings.gradle.kts

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
22
pluginManagement {
33
repositories {
4-
google()
5-
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
4+
google {
5+
mavenContent {
6+
includeGroupAndSubgroups("androidx")
7+
includeGroupAndSubgroups("com.android")
8+
includeGroupAndSubgroups("com.google")
9+
}
10+
}
611
mavenCentral()
712
gradlePluginPortal()
813
}
914
}
15+
1016
dependencyResolutionManagement {
1117
repositories {
12-
google()
18+
google {
19+
mavenContent {
20+
includeGroupAndSubgroups("androidx")
21+
includeGroupAndSubgroups("com.android")
22+
includeGroupAndSubgroups("com.google")
23+
}
24+
}
1325
mavenCentral()
14-
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
15-
maven("https://jitpack.io")
1626
}
1727
}
1828

0 commit comments

Comments
 (0)