Skip to content

Commit

Permalink
Merge pull request #16 from qiaoyuang/main
Browse files Browse the repository at this point in the history
Update to 1.2.7
  • Loading branch information
qiaoyuang authored Jun 9, 2023
2 parents e80056b + c375ff1 commit 353d726
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 27 deletions.
26 changes: 16 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
# MMKV-Kotlin Change Log

## v1.2.6/2023-03-10
< Note: Time format: MM-dd-yyyy

## v1.2.7 / 09-06-2023

* Based on `Kotlin 1.8.20`, `MMKV 1.2.16`

## v1.2.6 / 03-10-2023

* Based on `Kotlin 1.8.10`

* Android Gradle Plugin: 7.4.0 -> 7.3.1 (temporary)
* Android Build Tools: 33.0.1 -> 33.0.2

## v1.2.5/2023-01-23
## v1.2.5 / 01-23-2023

### Update MMKV Version

Expand All @@ -19,11 +25,11 @@

* Android Build Tools: 33.0.0 -> 33.0.1

## v1.2.5-alpha01/2022-12-28
## v1.2.5-alpha01 / 12-28-2022

* Test Github Action Publishing

## v1.2.4/2022-10-14
## v1.2.4 / 10-14-2022

### Update Kotlin Version

Expand All @@ -45,13 +51,13 @@

* Fix the bug about empty `NSData` convert to `ByteArray` ([PR#2](https://github.com/ctripcorp/mmkv-kotlin/pull/2))

## v1.2.2/2022-8-25
## v1.2.2 / 8-25-2022

### Update MMKV Version

* Based on `MMKV 1.2.14`

## v1.2.1/2022-7-17
## v1.2.1 / 7-17-2022

### Update Kotlin Version

Expand All @@ -61,19 +67,19 @@

* Update Android Target SDK to API 32

## v1.2.0/2022-06-13
## v1.2.0 / 06-13-2022

### Update Kotlin Version

* Based on `Kotlin 1.7.0`

## v1.1.1/2022-05-05
## v1.1.1 / 05-05-2022

### macOS Support

* Add the macOS(x64/arm64) supported

## v1.1.0/2022-04-25
## v1.1.0 / 04-25-2022

### Update Kotlin and MMKV Version

Expand All @@ -83,7 +89,7 @@

* Reamed the `MMKVModel` to `MMKVMode`

## v1.0.0/2022-04-19
## v1.0.0 / 04-19-2022

### Initial Release

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ Kotlin Multiplatform Common (kts):

```kotlin
dependencies {
implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.6")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.7")
}
```

Current version based on `Kotlin 1.8.10` and `MMKV 1.2.15`.
Current version based on `Kotlin 1.8.20` and `MMKV 1.2.16`.

Pure Android platform (kts):

Expand All @@ -31,10 +31,10 @@ Kotlin/Native on macOS:
```kotlin
dependencies {
// Intel Chip
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.6")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.7")

// M1&M2 Chip
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.6")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.7")
}
```
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 Expand Up @@ -62,7 +62,7 @@ kotlin {
cocoapods {
// ......
pod(name = "MMKV") {
version = "1.2.15"
version = "1.2.16"
moduleName = "MMKV"
}
}
Expand Down
12 changes: 6 additions & 6 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.6")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.7")
}
```

当前版本依赖于 `Kotlin 1.8.10` 以及 `MMKV 1.2.15`
当前版本依赖于 `Kotlin 1.8.20` 以及 `MMKV 1.2.16`

纯 Android 平台(kts):

```kotlin
dependencies {
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.6")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.7")
}
```

Expand All @@ -29,10 +29,10 @@ Kotlin/Native on macOS:
```kotlin
dependencies {
// Intel 芯片
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.6")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.7")

// M1&M2 芯片
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.6")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.7")
}
```
注意,如果你的工程为 macOS 的 Kotlin/Native 可执行程序工程,或者它直接向一个 iOS 应用程序工程提供 framework,那么您需要手动在工程中添加对 MMKV 的依赖,并可能需要添加对 MMKV 及 MMKVCore 的 `linkerOpts`
Expand Down Expand Up @@ -60,7 +60,7 @@ kotlin {
cocoapods {
// ......
pod(name = "MMKV") {
version = "1.2.15"
version = "1.2.16"
moduleName = "MMKV"
}
}
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.8.10")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
classpath("com.android.tools.build:gradle:7.3.1")
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Feb 22 11:03:04 CST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
4 changes: 2 additions & 2 deletions 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.6'
spec.version = '1.2.7'
spec.homepage = 'Link to the Shared Module homepage'
spec.source = { :http=> ''}
spec.authors = ''
Expand All @@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
spec.libraries = 'c++'
spec.ios.deployment_target = '14.1'
spec.osx.deployment_target = '12.2.1'
spec.dependency 'MMKV', '1.2.15'
spec.dependency 'MMKV', '1.2.16'

spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':mmkv-kotlin',
Expand Down
4 changes: 2 additions & 2 deletions mmkv-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
signing
}

version = "1.2.6"
version = "1.2.7"
group = "com.ctrip.flight.mmkv"

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

val mmkvVersion = "1.2.15"
val mmkvVersion = "1.2.16"

kotlin {
android {
Expand Down

0 comments on commit 353d726

Please sign in to comment.