Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 1.2.15 #41

Merged
merged 5 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v3

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down Expand Up @@ -64,24 +64,24 @@ jobs:
if: steps.avd-cache.outputs.cache-hit != 'true'
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 34
api-level: 35
target: google_apis
arch: x86_64
profile: pixel_6
emulator-build: 12265550
emulator-build: 12694320
force-avd-creation: false
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: true
script: echo "Generated AVD snapshot for caching."

- name: Run Android 14 Instrumented Tests
- name: Run Android 15 Instrumented Tests
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 34
api-level: 35
target: google_apis
arch: x86_64
profile: pixel_6
emulator-build: 12265550
emulator-build: 12694320
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v3

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down
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.14/ 2024-12-06

* Based on `Kotlin 2.1.0`, `MMKV 2.0.0`

## v1.2.14/ 2024-08-31

* Fixed the function `MMKV_KMP.withOpen`
Expand Down
12 changes: 6 additions & 6 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.14")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.15")
}
```

Current version is based on `Kotlin 2.0.20` and `MMKV 1.3.9`.
Current version is based on `Kotlin 2.1.0` and `MMKV 2.0.0`.

Pure Android platform (kts):

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

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

// M1&M2 Chip
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.14")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.15")
}
```
Note, if your project is a Kotlin/Native executable program project of macOS, or it supplies a framework to an iOS application project directly, then you need to manually add the dependency of MMKV, and may need to add `linkerOpts` for MMKV and MMKVCore:
Expand Down Expand Up @@ -62,7 +62,7 @@ kotlin {
cocoapods {
// ......
pod(name = "MMKV") {
version = "1.3.9"
version = "2.0.1"
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.14")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin:1.2.15")
}
```

当前版本依赖于 `Kotlin 2.0.20` 以及 `MMKV 1.3.9`。
当前版本依赖于 `Kotlin 2.1.0` 以及 `MMKV 2.0.0`。

纯 Android 平台(kts):

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

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

// M1&M2 芯片
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.14")
implementation("com.ctrip.flight.mmkv:mmkv-kotlin-macosarm64:1.2.15")
}
```
注意,如果你的工程为 macOS 的 Kotlin/Native 可执行程序工程,或者它直接向一个 iOS 应用程序工程提供 framework,那么您需要手动在工程中添加对 MMKV 的依赖,并可能需要添加对 MMKV 及 MMKVCore 的 `linkerOpts`:
Expand Down Expand Up @@ -60,7 +60,7 @@ kotlin {
cocoapods {
// ......
pod(name = "MMKV") {
version = "1.3.9"
version = "2.0.0"
moduleName = "MMKV"
}
}
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ android.enableJetifier=true
kotlin.code.style=official
kotlin.mpp.stability.nowarn=true
kotlin.mpp.enableCInteropCommonization=true
kotlin.natvie.increment=true
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]

kotlin = "2.0.20"
agp = "8.6.0"
mmkv = "1.3.9"
kotlin = "2.1.0"
agp = "8.7.3"
mmkv = "2.0.0"
junit = "4.13.2"
androidx-test = "1.6.1"
androidx-test-runner = "1.6.2"
Expand Down
8 changes: 4 additions & 4 deletions mmkv-kotlin/MMKV_Kotlin.podspec
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Pod::Spec.new do |spec|
spec.name = 'mmkv_kotlin'
spec.version = '1.2.14'
spec.version = '1.2.15'
spec.homepage = 'Link to the Shared Module homepage'
spec.source = { :http=> ''}
spec.authors = ''
spec.license = ''
spec.summary = 'Some description for the Shared Module'
spec.vendored_frameworks = 'build/cocoapods/framework/MMKV_Kotlin.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '17.5.1'
spec.osx.deployment_target = '14.4.1'
spec.dependency 'MMKV', '1.3.9'
spec.ios.deployment_target = '18.1.1'
spec.osx.deployment_target = '15.1.1'
spec.dependency 'MMKV', '2.0.0'

if !Dir.exist?('build/cocoapods/framework/MMKV_Kotlin.framework') || Dir.empty?('build/cocoapods/framework/MMKV_Kotlin.framework')
raise "
Expand Down
36 changes: 15 additions & 21 deletions 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.14"
version = "1.2.15"
group = "com.ctrip.flight.mmkv"

@OptIn(ExperimentalKotlinGradlePluginApi::class)
Expand All @@ -32,8 +32,8 @@ kotlin {
cocoapods {
summary = "Some description for the Shared Module"
homepage = "Link to the Shared Module homepage"
ios.deploymentTarget = "17.5.1"
osx.deploymentTarget = "14.4.1"
ios.deploymentTarget = "18.1.1"
osx.deploymentTarget = "15.1.1"
framework {
baseName = "MMKV-Kotlin"
isStatic = true
Expand All @@ -48,38 +48,32 @@ kotlin {
all {
languageSettings.optIn("kotlin.RequiresOptIn")
}
val commonTest by getting {
dependencies {
implementation(kotlin("test"))
}
commonTest.dependencies {
implementation(kotlin("test"))
}
val androidMain by getting {
dependencies {
api(libs.mmkv)
}
androidMain.dependencies {
api(libs.mmkv)
}
val androidInstrumentedTest by getting {
dependencies {
implementation(kotlin("test-junit"))
implementation(libs.junit)
implementation(libs.androidx.test.core)
implementation(libs.androidx.test.runner)
implementation(libs.androidx.test.rules)
}
androidInstrumentedTest.dependencies {
implementation(kotlin("test-junit"))
implementation(libs.junit)
implementation(libs.androidx.test.core)
implementation(libs.androidx.test.runner)
implementation(libs.androidx.test.rules)
}
}
}

android {
namespace = "com.ctrip.flight.mmkv"
compileSdk = 34
compileSdk = 35
defaultConfig {
minSdk = 23
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_21
}
}

Expand Down
2 changes: 0 additions & 2 deletions mmkv-kotlin/src/androidMain/AndroidManifest.xml

This file was deleted.

Loading