Skip to content

Commit 13f8958

Browse files
authored
Merge pull request #12 from qiaoyuang/main
Update to 1.2.5
2 parents 90c9629 + 5155260 commit 13f8958

File tree

7 files changed

+39
-23
lines changed

7 files changed

+39
-23
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# MMKV-Kotlin Change Log
22

3+
## v1.2.5/2023-01-23
4+
5+
### Update MMKV Version
6+
7+
* Based on `MMKV 1.2.15`
8+
9+
### Update Other Build Tools
10+
11+
* Android Gradle Plugin: 7.3.0 -> 7.4.0
12+
13+
* Android Build Tools: 33.0.0 -> 33.0.1
14+
315
## v1.2.5-alpha01/2022-12-28
416

517
* Test Github Action Publishing
@@ -29,6 +41,7 @@
2941
## v1.2.2/2022-8-25
3042

3143
### Update MMKV Version
44+
3245
* Based on `MMKV 1.2.14`
3346

3447
## v1.2.1/2022-7-17
@@ -44,6 +57,7 @@
4457
## v1.2.0/2022-06-13
4558

4659
### Update Kotlin Version
60+
4761
* Based on `Kotlin 1.7.0`
4862

4963
## v1.1.1/2022-05-05
@@ -65,4 +79,5 @@
6579
## v1.0.0/2022-04-19
6680

6781
### Initial Release
82+
6883
* Based on `Kotlin 1.6.10`, `MMKV 1.2.12`

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ Kotlin Multiplatform Common (kts):
1212

1313
```kotlin
1414
dependencies {
15-
implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.4")
15+
implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.5")
1616
}
1717
```
1818

19-
Current version based on `Kotlin 1.7.20` and `MMKV 1.2.14`.
19+
Current version based on `Kotlin 1.7.20` and `MMKV 1.2.15`.
2020

2121
Pure Android platform (kts):
2222

2323
```kotlin
2424
dependencies {
25-
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.4")
25+
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.5")
2626
}
2727
```
2828

@@ -31,10 +31,10 @@ Kotlin/Native on macOS:
3131
```kotlin
3232
dependencies {
3333
// Intel Chip
34-
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.4")
34+
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.5")
3535

3636
// M1&M2 Chip
37-
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.4")
37+
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.5")
3838
}
3939
```
4040
Note, if you want to import MMKV-Kotlin to your Kotlin/Native executable project that target is macOS, you need to manually add dependency on MMKV, and add `linkerOpts` on MMKV and MMKVCore:
@@ -62,7 +62,7 @@ kotlin {
6262
cocoapods {
6363
// ......
6464
pod(name = "MMKV") {
65-
version = "1.2.14"
65+
version = "1.2.15"
6666
moduleName = "MMKV"
6767
}
6868
}

README_CN.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ Kotlin Multiplatform Common (kts):
1010

1111
```kotlin
1212
dependencies {
13-
implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.4")
13+
implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.5")
1414
}
1515
```
1616

17-
当前版本依赖于 `Kotlin 1.7.20` 以及 `MMKV 1.2.14`
17+
当前版本依赖于 `Kotlin 1.7.20` 以及 `MMKV 1.2.15`
1818

1919
纯 Android 平台(kts):
2020

2121
```kotlin
2222
dependencies {
23-
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.4")
23+
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.5")
2424
}
2525
```
2626

@@ -29,10 +29,10 @@ Kotlin/Native on macOS:
2929
```kotlin
3030
dependencies {
3131
// Intel 芯片
32-
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.4")
32+
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.5")
3333

3434
// M1&M2 芯片
35-
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.4")
35+
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.5")
3636
}
3737
```
3838
注意,如果您在目标平台为 macOS 的 Kotlin/Native 可执行程序工程中导入 MMKV-Kotlin,您需要手动在工程中添加对 MMKV 的依赖,并添加对 MMKV 及 MMKVCore 的 `linkerOpts`
@@ -60,7 +60,7 @@ kotlin {
6060
cocoapods {
6161
// ......
6262
pod(name = "MMKV") {
63-
version = "1.2.14"
63+
version = "1.2.15"
6464
moduleName = "MMKV"
6565
}
6666
}

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
dependencies {
88
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
9-
classpath("com.android.tools.build:gradle:7.3.1")
9+
classpath("com.android.tools.build:gradle:7.4.0")
1010
}
1111
}
1212

mmkv-kotlin/MMKV_Kotlin.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'mmkv_kotlin'
3-
spec.version = '1.2.5-alpha01'
3+
spec.version = '1.2.5'
44
spec.homepage = 'Link to the Shared Module homepage'
55
spec.source = { :http=> ''}
66
spec.authors = ''
@@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
1010
spec.libraries = 'c++'
1111
spec.ios.deployment_target = '14.1'
1212
spec.osx.deployment_target = '12.2.1'
13-
spec.dependency 'MMKV', '1.2.14'
13+
spec.dependency 'MMKV', '1.2.15'
1414

1515
spec.pod_target_xcconfig = {
1616
'KOTLIN_PROJECT_PATH' => ':mmkv-kotlin',

mmkv-kotlin/build.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
signing
1010
}
1111

12-
version = "1.2.5-alpha01"
12+
version = "1.2.5"
1313
group = "com.ctrip.flight.mmkv"
1414

1515
val NEXUS_USERNAME: String by project
@@ -19,7 +19,7 @@ val javadocJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
1919
archiveClassifier.set("javadoc")
2020
}
2121

22-
val mmkvVersion = "1.2.14"
22+
val mmkvVersion = "1.2.15"
2323

2424
kotlin {
2525
android {
@@ -76,7 +76,7 @@ kotlin {
7676
implementation(kotlin("test-junit"))
7777
implementation("junit:junit:4.13.2")
7878
implementation("androidx.test:core:1.5.0")
79-
implementation("androidx.test:runner:1.5.1")
79+
implementation("androidx.test:runner:1.5.2")
8080
implementation("androidx.test:rules:1.5.0")
8181
}
8282
}
@@ -111,15 +111,14 @@ kotlin {
111111

112112
android {
113113
compileSdk = 33
114-
buildToolsVersion = "33.0.0"
114+
buildToolsVersion = "33.0.1"
115115
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
116116
sourceSets.getByName("androidTest") {
117117
manifest.srcFile(File("src/androidTest/AndroidManifest.xml"))
118118
java.setSrcDirs(listOf("src/androidTest/kotlin"))
119119
}
120120
defaultConfig {
121121
minSdk = 23
122-
targetSdk = 33
123122
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
124123
}
125124
testOptions {
@@ -129,8 +128,8 @@ android {
129128
}
130129
}
131130
compileOptions {
132-
sourceCompatibility = JavaVersion.VERSION_1_8
133-
targetCompatibility = JavaVersion.VERSION_1_8
131+
sourceCompatibility = JavaVersion.VERSION_11
132+
targetCompatibility = JavaVersion.VERSION_11
134133
}
135134
}
136135

mmkv-kotlin/src/appleTest/kotlin/com/ctrip/flight/mmkv/MMKVKMMTestIos.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616

1717
package com.ctrip.flight.mmkv
1818

19+
import kotlinx.cinterop.toKString
1920
import platform.Foundation.*
21+
import platform.posix.getenv
2022
import kotlin.test.*
2123

2224
/**
@@ -30,7 +32,7 @@ class MMKVKotlinTestIos {
3032

3133
@BeforeTest
3234
fun setUp() {
33-
initialize()
35+
initialize("/Users/${getenv("USER")!!.toKString()}/Downloads")
3436
mmkvTest = MMKVKotlinTest().apply {
3537
setUp()
3638
}

0 commit comments

Comments
 (0)