Skip to content

Commit

Permalink
Update Kotlin version to 1.9.21
Browse files Browse the repository at this point in the history
  • Loading branch information
qiaoyuang committed Nov 28, 2023
1 parent 8327f6a commit a4d5145
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 18 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
```

Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
```

Expand All @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down
2 changes: 1 addition & 1 deletion mmkv-kotlin/MMKV_Kotlin.podspec
Original file line number Diff line number Diff line change
@@ -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 = ''
Expand Down
2 changes: 1 addition & 1 deletion mmkv-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
signing
}

version = "1.2.9"
version = "1.2.10"
group = "com.ctrip.flight.mmkv"

val mmkvVersion = "1.3.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -50,4 +51,4 @@ fun backedUpMMKVWithID(
rootPath: String,
): MMKV_KMP = MMKVImpl(MMKV.backedUpMMKVWithID(
mmapID, mode.rawValue, cryptKey, rootPath,
))
))
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.ctrip.flight.mmkv

import kotlin.jvm.JvmOverloads

/**
* MMKV create function common expect
* @author yaqiao
Expand All @@ -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

0 comments on commit a4d5145

Please sign in to comment.