From a4d5145940cd3e770330b1b51b7d17131fcf1d2c Mon Sep 17 00:00:00 2001 From: qiaoyuang Date: Tue, 28 Nov 2023 10:45:53 +0800 Subject: [PATCH] Update Kotlin version to 1.9.21 --- CHANGELOG.md | 4 ++++ README.md | 10 +++++----- README_CN.md | 10 +++++----- build.gradle.kts | 2 +- mmkv-kotlin/MMKV_Kotlin.podspec | 2 +- mmkv-kotlin/build.gradle.kts | 2 +- .../kotlin/com/ctrip/flight/mmkv/CreatorAndroid.kt | 3 ++- .../commonMain/kotlin/com/ctrip/flight/mmkv/Creator.kt | 5 +---- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e73d47c..0fef741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ - Date format: YYYY-MM-dd +## v1.2.10 / 2023-11-28 + +* Update Kotlin version to `1.9.21` for fixing this [issue](https://youtrack.jetbrains.com/issue/KT-62515) + ## v1.2.9 / 2023-11-24 * Based on `Kotlin 1.9.20`, `MMKV 1.3.2` diff --git a/README.md b/README.md index 8684375..6d8a351 100644 --- a/README.md +++ b/README.md @@ -12,17 +12,17 @@ Kotlin Multiplatform Common (kts): ```kotlin dependencies { - implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.9") + implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.10") } ``` -Current version based on `Kotlin 1.9.20` and `MMKV 1.3.2`. +Current version based on `Kotlin 1.9.21` and `MMKV 1.3.2`. Pure Android platform (kts): ```kotlin dependencies { - implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.9") + implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.10") } ``` @@ -31,10 +31,10 @@ Kotlin/Native on macOS： ```kotlin dependencies { // Intel Chip - implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.9") + implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.10") // M1&M2 Chip - implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.9") + implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.10") } ``` Note, if your project is a Kotlin/Native executable program project of macOS or it supply a framework to a iOS application project directly, then you need to manually add dependency on MMKV, and may need add `linkerOpts` on MMKV and MMKVCore： diff --git a/README_CN.md b/README_CN.md index 783fddc..dea9192 100644 --- a/README_CN.md +++ b/README_CN.md @@ -10,17 +10,17 @@ Kotlin Multiplatform Common (kts): ```kotlin dependencies { - implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.9") + implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.10") } ``` -当前版本依赖于 `Kotlin 1.9.20` 以及 `MMKV 1.3.2`。 +当前版本依赖于 `Kotlin 1.9.21` 以及 `MMKV 1.3.2`。 纯 Android 平台（kts）： ```kotlin dependencies { - implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.9") + implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.10") } ``` @@ -29,10 +29,10 @@ Kotlin/Native on macOS： ```kotlin dependencies { // Intel 芯片 - implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.9") + implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.10") // M1&M2 芯片 - implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.9") + implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.10") } ``` 注意，如果你的工程为 macOS 的 Kotlin/Native 可执行程序工程，或者它直接向一个 iOS 应用程序工程提供 framework，那么您需要手动在工程中添加对 MMKV 的依赖，并可能需要添加对 MMKV 及 MMKVCore 的 `linkerOpts`： diff --git a/build.gradle.kts b/build.gradle.kts index ad26cda..e4581c9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21") classpath("com.android.tools.build:gradle:8.1.4") } } diff --git a/mmkv-kotlin/MMKV_Kotlin.podspec b/mmkv-kotlin/MMKV_Kotlin.podspec index f91f228..553900d 100644 --- a/mmkv-kotlin/MMKV_Kotlin.podspec +++ b/mmkv-kotlin/MMKV_Kotlin.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'mmkv_kotlin' - spec.version = '1.2.9' + spec.version = '1.2.10' spec.homepage = 'Link to the Shared Module homepage' spec.source = { :http=> ''} spec.authors = '' diff --git a/mmkv-kotlin/build.gradle.kts b/mmkv-kotlin/build.gradle.kts index 427eb89..360873e 100644 --- a/mmkv-kotlin/build.gradle.kts +++ b/mmkv-kotlin/build.gradle.kts @@ -10,7 +10,7 @@ plugins { signing } -version = "1.2.9" +version = "1.2.10" group = "com.ctrip.flight.mmkv" val mmkvVersion = "1.3.2" diff --git a/mmkv-kotlin/src/androidMain/kotlin/com/ctrip/flight/mmkv/CreatorAndroid.kt b/mmkv-kotlin/src/androidMain/kotlin/com/ctrip/flight/mmkv/CreatorAndroid.kt index 889effe..c25fd5c 100644 --- a/mmkv-kotlin/src/androidMain/kotlin/com/ctrip/flight/mmkv/CreatorAndroid.kt +++ b/mmkv-kotlin/src/androidMain/kotlin/com/ctrip/flight/mmkv/CreatorAndroid.kt @@ -27,6 +27,7 @@ actual fun defaultMMKV(): MMKV_KMP = MMKVImpl(MMKV.defaultMMKV()) actual fun defaultMMKV(cryptKey: String): MMKV_KMP = MMKVImpl(MMKV.defaultMMKV(MMKV.SINGLE_PROCESS_MODE, cryptKey)) +@JvmOverloads actual fun mmkvWithID( mmapId: String, mode: MMKVMode, @@ -50,4 +51,4 @@ fun backedUpMMKVWithID( rootPath: String, ): MMKV_KMP = MMKVImpl(MMKV.backedUpMMKVWithID( mmapID, mode.rawValue, cryptKey, rootPath, -)) +)) \ No newline at end of file diff --git a/mmkv-kotlin/src/commonMain/kotlin/com/ctrip/flight/mmkv/Creator.kt b/mmkv-kotlin/src/commonMain/kotlin/com/ctrip/flight/mmkv/Creator.kt index decde99..e6fb759 100644 --- a/mmkv-kotlin/src/commonMain/kotlin/com/ctrip/flight/mmkv/Creator.kt +++ b/mmkv-kotlin/src/commonMain/kotlin/com/ctrip/flight/mmkv/Creator.kt @@ -16,8 +16,6 @@ package com.ctrip.flight.mmkv -import kotlin.jvm.JvmOverloads - /** * MMKV create function common expect * @author yaqiao @@ -27,10 +25,9 @@ expect fun defaultMMKV(): MMKV_KMP expect fun defaultMMKV(cryptKey: String): MMKV_KMP -@JvmOverloads expect fun mmkvWithID( mmapId: String, mode: MMKVMode = MMKVMode.SINGLE_PROCESS, cryptKey: String? = null, rootPath: String? = null, -): MMKV_KMP +): MMKV_KMP \ No newline at end of file