Merge pull request #14 from qiaoyuang/main

Update version to 1.2.6

CHANGELOG.md

@@ -1,5 +1,12 @@
 # MMKV-Kotlin Change Log
 
+## v1.2.6/2023-03-10
+
+* 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
 
 ### Update MMKV Version

README.md

@@ -12,17 +12,17 @@ Kotlin Multiplatform Common (kts):
 
 ```kotlin
 dependencies {     
-    implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.5")
+    implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.6")
 }
 ```
 
-Current version based on `Kotlin 1.7.20` and `MMKV 1.2.15`.
+Current version based on `Kotlin 1.8.10` and `MMKV 1.2.15`.
 
 Pure Android platform (kts):
 
 ```kotlin
 dependencies {     
-    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.5")
+    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.6")
 }
 ```
 
@@ -31,10 +31,10 @@ Kotlin/Native on macOS：
 ```kotlin
 dependencies { 
     // Intel Chip
-    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.5")
+    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.6")
 
     // M1&M2 Chip
-    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.5")
+    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.6")
 }
 ```
 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：

README_CN.md

@@ -10,17 +10,17 @@ Kotlin Multiplatform Common (kts):
 
 ```kotlin
 dependencies { 
-    implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.5")
+    implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.6")
 }
 ```
 
-当前版本依赖于 `Kotlin 1.7.20` 以及 `MMKV 1.2.15`。
+当前版本依赖于 `Kotlin 1.8.10` 以及 `MMKV 1.2.15`。
 
 纯 Android 平台（kts）：
 
 ```kotlin
 dependencies { 
-    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.5")
+    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-android:1.2.6")
 }
 ```
 
@@ -29,10 +29,10 @@ Kotlin/Native on macOS：
 ```kotlin
 dependencies { 
     // Intel 芯片
-    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.5")
+    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosx64:1.2.6")
 
     // M1&M2 芯片
-    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.5")
+    implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.6")
 }
 ```
 注意，如果您在目标平台为 macOS 的 Kotlin/Native 可执行程序工程中导入 MMKV-Kotlin，您需要手动在工程中添加对 MMKV 的依赖，并添加对 MMKV 及 MMKVCore 的 `linkerOpts`：

build.gradle.kts

@@ -5,8 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
-        classpath("com.android.tools.build:gradle:7.4.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+        classpath("com.android.tools.build:gradle:7.3.1")
     }
 }
 

gradle.properties

@@ -15,3 +15,4 @@ android.disableAutomaticComponentCreation=true
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.androidSourceSetLayoutVersion=2

mmkv-kotlin/MMKV_Kotlin.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'mmkv_kotlin'
-    spec.version                  = '1.2.5'
+    spec.version                  = '1.2.6'
     spec.homepage                 = 'Link to the Shared Module homepage'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

mmkv-kotlin/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
     signing
 }
 
-version = "1.2.5"
+version = "1.2.6"
 group = "com.ctrip.flight.mmkv"
 
 val NEXUS_USERNAME: String by project
@@ -71,8 +71,9 @@ kotlin {
                 api("com.tencent:mmkv-static:$mmkvVersion")
             }
         }
-        val androidTest by getting {
+        val androidInstrumentedTest by getting {
             dependencies {
+                dependsOn(commonTest)
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")
                 implementation("androidx.test:core:1.5.0")
@@ -111,12 +112,7 @@ kotlin {
 
 android {
     compileSdk = 33
-    buildToolsVersion = "33.0.1"
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    sourceSets.getByName("androidTest") {
-        manifest.srcFile(File("src/androidTest/AndroidManifest.xml"))
-        java.setSrcDirs(listOf("src/androidTest/kotlin"))
-    }
+    buildToolsVersion = "33.0.2"
     defaultConfig {
         minSdk = 23
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"