Skip to content

Commit cf723ae

Browse files
committed
版本更新至1.0.2和兼容性调整
- 更新应用版本号至1.0.2。 - 调整Java和Kotlin编译选项以兼容JVM 11。 - 进行iOS资源和属性文件的调整。 - 更新gradle配置文件以反映最新的库和版本。
1 parent e09a46c commit cf723ae

File tree

17 files changed

+198
-511
lines changed

17 files changed

+198
-511
lines changed

composeApp/build.gradle.kts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2+
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
24
import java.util.*
35

46
plugins {
@@ -14,10 +16,9 @@ kotlin {
1416
jvm("desktop")
1517

1618
androidTarget {
17-
compilations.all {
18-
kotlinOptions {
19-
jvmTarget = "1.8"
20-
}
19+
@OptIn(ExperimentalKotlinGradlePluginApi::class)
20+
compilerOptions {
21+
jvmTarget.set(JvmTarget.JVM_11)
2122
}
2223
}
2324

@@ -163,8 +164,8 @@ android {
163164
}
164165

165166
compileOptions {
166-
sourceCompatibility = JavaVersion.VERSION_1_8
167-
targetCompatibility = JavaVersion.VERSION_1_8
167+
sourceCompatibility = JavaVersion.VERSION_11
168+
targetCompatibility = JavaVersion.VERSION_11
168169
}
169170

170171
}

composeApp/src/commonMain/kotlin/core/shared/AppConst.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.github.vrcmteam.vrcm.core.shared
33
object AppConst {
44
const val APP_NAME = "VRCM"
55

6-
const val APP_VERSION = "1.0.1"
6+
const val APP_VERSION = "1.0.2"
77

88
const val APP_GITHUB_URL = "https://github.com/vrcm-team/VRCM"
99

composeApp/src/desktopMain/kotlin/main.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.ui.window.Window
88
import androidx.compose.ui.window.WindowPosition
99
import androidx.compose.ui.window.application
1010
import androidx.compose.ui.window.rememberWindowState
11+
import io.github.vrcmteam.vrcm.core.shared.AppConst.APP_NAME
1112
import io.github.vrcmteam.vrcm.di.commonModules
1213
import io.github.vrcmteam.vrcm.di.modules.platformModule
1314
import org.jetbrains.compose.resources.painterResource
@@ -29,7 +30,7 @@ fun main() = run {
2930
Window(
3031
state = windowState,
3132
onCloseRequest = ::exitApplication,
32-
title = "VRCM",
33+
title = APP_NAME,
3334
icon = painterResource(Res.drawable.logo)
3435
) {
3536
App()

gradle/libs.versions.toml

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,28 @@
11
[versions]
2-
app-code = "1"
3-
app-name = "1.0.1"
2+
app-code = "2"
3+
app-name = "1.0.2"
44
app-packageName = "io.github.vrcmteam.vrcm"
55
agp = "8.2.2"
6-
android-compileSdk = "34"
7-
android-minSdk = "24"
8-
android-targetSdk = "34"
9-
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"
196
kotlin = "2.0.20"
207
kotlinx-coroutines-swing = "1.8.1"
218
kotlinx-datetime = "0.6.0"
9+
android-minSdk = "24"
10+
android-compileSdk = "34"
11+
android-targetSdk = "34"
12+
androidx-activityCompose = "1.9.2"
2213
multiplatform-settings = "1.1.1"
23-
jetpack-compose-bom = "2024.08.00"
24-
koin = "3.6.0-wasm-alpha2"
14+
compose-plugin = "1.6.11"
15+
koin = "3.6.0-alpha1"
2516
stately-common = "2.0.6"
2617
voyager = "1.1.0-alpha03"
2718
coil3 = "3.0.0-alpha04"
28-
ktor-client = "2.3.8"
19+
ktor-client = "2.3.12"
2920
chrisbanes-haze = "0.7.3"
3021
[libraries]
3122
# kotlinx
3223
kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines-swing" }
3324
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
3425
# compose
35-
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "jetpack-compose-bom" }
3626
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
3727
# settings
3828
multiplatform-settings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatform-settings" }

0 commit comments

Comments
 (0)