Merge pull request #1590 from Tencent/dev

lingol · web-flow · commit cf95303ab1f0 · 2025-09-25T15:16:55.000+08:00
for v2.2.4
diff --git a/Android/MMKV/gradle.properties b/Android/MMKV/gradle.properties
@@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME_PREFIX=2.2.3
+VERSION_NAME_PREFIX=2.2.4
 #VERSION_NAME_SUFFIX=-SNAPSHOT
 VERSION_NAME_SUFFIX=
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,13 @@
 # MMKV Change Log
+## v2.2.4 / 2025-09-25
+This is a hotfix release mainly for iOS/macOS CocoaPods users.
+
+### Changes for All platforms
+* Improve the performance of MMBuffer a little bit in some cases.
+
+### iOS/macOS
+* Make MMKV and MMKVCore podspec define modules.
+
 ## v2.2.3 / 2025-08-20
 This is a feature release that brings **full desktop support to Flutter**. It also includes key bug fixes and enhancements for Android and other platforms.
 
diff --git a/Core/MMBuffer.cpp b/Core/MMBuffer.cpp
@@ -170,11 +170,8 @@ MMBuffer &MMBuffer::operator=(MMBuffer &&other) noexcept {
 #endif
             other.detach();
         } else {
-            uint8_t tmp[SmallBufferSize()];
-            memcpy(tmp, other.paddedBuffer, other.paddedSize);
-            memcpy(other.paddedBuffer, paddedBuffer, paddedSize);
-            memcpy(paddedBuffer, tmp, other.paddedSize);
-            std::swap(paddedSize, other.paddedSize);
+            paddedSize = other.paddedSize;
+            memcpy(paddedBuffer, other.paddedBuffer, other.paddedSize);
         }
     }
 
diff --git a/Core/MMKVPredef.h b/Core/MMKVPredef.h
@@ -34,7 +34,7 @@
 #include <vector>
 #include <unordered_map>
 
-constexpr auto MMKV_VERSION = "v2.2.3";
+constexpr auto MMKV_VERSION = "v2.2.4";
 
 #ifdef DEBUG
 #    define MMKV_DEBUG
diff --git a/MMKV.podspec b/MMKV.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MMKV"
-  s.version      = "2.2.3"
+  s.version      = "2.2.4"
   s.summary      = "MMKV is a cross-platform key-value storage framework developed by WeChat."
 
   s.description  = <<-DESC
@@ -31,9 +31,10 @@ Pod::Spec.new do |s|
     "CLANG_CXX_LANGUAGE_STANDARD" => "gnu++20",
     "CLANG_CXX_LIBRARY" => "libc++",
     "CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF" => "NO",
+    "DEFINES_MODULE" => "YES",
   }
 
-  s.dependency 'MMKVCore', '~> 2.2.3'
+  s.dependency 'MMKVCore', '~> 2.2.4'
 
 end
 
diff --git a/MMKVAppExtension.podspec b/MMKVAppExtension.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MMKVAppExtension"
-  s.version      = "2.2.3"
+  s.version      = "2.2.4"
   s.summary      = "MMKV is a cross-platform key-value storage framework developed by WeChat."
   s.module_name  = "MMKVAppExtension"
 
@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
     "GCC_PREPROCESSOR_DEFINITIONS" => "MMKV_IOS_EXTENSION",
   }
 
-  s.dependency 'MMKVCore', '~> 2.2.3'
+  s.dependency 'MMKVCore', '~> 2.2.4'
 
 end
 
diff --git a/MMKVCore.podspec b/MMKVCore.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MMKVCore"
-  s.version      = "2.2.3"
+  s.version      = "2.2.4"
   s.summary      = "MMKVCore for MMKV. MMKV is a cross-platform key-value storage framework developed by WeChat."
 
   s.description  = <<-DESC
@@ -36,6 +36,7 @@ Pod::Spec.new do |s|
     "CLANG_CXX_LANGUAGE_STANDARD" => "gnu++20",
     "CLANG_CXX_LIBRARY" => "libc++",
     "CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF" => "NO",
+    "DEFINES_MODULE" => "YES",
     'RELEASE' => {
       'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) NDEBUG=1'
     }
diff --git a/MMKVWatchExtension.podspec b/MMKVWatchExtension.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MMKVWatchExtension"
-  s.version      = "2.2.3"
+  s.version      = "2.2.4"
   s.summary      = "MMKV is a cross-platform key-value storage framework developed by WeChat."
   s.module_name  = "MMKVWatchExtension"
 
@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
     "GCC_PREPROCESSOR_DEFINITIONS" => "MMKV_IOS_EXTENSION",
   }
 
-  s.dependency 'MMKVCore', '~> 2.2.3'
+  s.dependency 'MMKVCore', '~> 2.2.4'
 
 end
 
diff --git a/OpenHarmony/MMKV/CHANGELOG.md b/OpenHarmony/MMKV/CHANGELOG.md
@@ -1,4 +1,7 @@
 # MMKV for HarmonyOS NEXT Change Log
+## v2.2.4 / 2025-09-25
+* Improve the performance of MMBuffer a little bit in some cases.
+
 ## v2.2.3 / 2025-08-20
 * Keep up with Core library v2.2.3.
 
diff --git a/OpenHarmony/MMKV/README.md b/OpenHarmony/MMKV/README.md
@@ -1,6 +1,6 @@
 [![license](https://img.shields.io/badge/license-BSD_3-brightgreen.svg?style=flat)](https://github.com/Tencent/MMKV/blob/master/LICENSE.TXT)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/MMKV/pulls)
-[![Release Version](https://img.shields.io/badge/release-2.2.3-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
+[![Release Version](https://img.shields.io/badge/release-2.2.4-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
 [![Platform](https://img.shields.io/badge/Platform-%20HarmonyOS%20NEXT-brightgreen.svg)](https://github.com/Tencent/MMKV/wiki/home)
 
 MMKV is an **efficient**, **small**, **easy-to-use** mobile key-value storage framework used in the WeChat application. It's now available on **HarmonyOS NEXT**.
@@ -37,7 +37,7 @@ Or, you can add it to your project manually.
 
   ```json
   "dependencies": {
-      "@tencent/mmkv": "~2.2.3",
+      "@tencent/mmkv": "~2.2.4",
   }
   ```
 * Then run
diff --git a/OpenHarmony/MMKV/oh-package.json5 b/OpenHarmony/MMKV/oh-package.json5
@@ -1,6 +1,6 @@
 {
   "name": "@tencent/mmkv",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "The official OpenHarmony package of MMKV. An efficient, small mobile key-value storage framework developed by WeChat.",
   "main": "Index.ets",
   "author": "guoling",
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![license](https://img.shields.io/badge/license-BSD_3-brightgreen.svg?style=flat)](https://github.com/Tencent/MMKV/blob/master/LICENSE.TXT)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/MMKV/pulls)
-[![Release Version](https://img.shields.io/badge/release-2.2.3-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
+[![Release Version](https://img.shields.io/badge/release-2.2.4-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
 [![Platform](https://img.shields.io/badge/Platform-%20Android%20%7C%20iOS%2FmacOS%20%7C%20Windows%20%7C%20POSIX%20%7C%20HarmonyOS%20NEXT-brightgreen.svg)](https://github.com/Tencent/MMKV/wiki/home)
 
 中文版本请参看[这里](./README_CN.md)
@@ -28,8 +28,8 @@ Add the following lines to `build.gradle` on your app module:
 
 ```gradle
 dependencies {
-    implementation 'com.tencent:mmkv:2.2.3'
-    // replace "2.2.3" with any available version
+    implementation 'com.tencent:mmkv:2.2.4'
+    // replace "2.2.4" with any available version
 }
 ```
 
diff --git a/README_CN.md b/README_CN.md
@@ -22,8 +22,8 @@ MMKV 是基于 mmap 内存映射的 key-value 组件，底层序列化/反序列
 
 ```gradle
 dependencies {
-    implementation 'com.tencent:mmkv:2.2.3'
-    // replace "2.2.3" with any available version
+    implementation 'com.tencent:mmkv:2.2.4'
+    // replace "2.2.4" with any available version
 }
 ```
 从 v2.0.0 起, MMKV **去掉了 32-bit 架构的支持**、API level 22 及以下的支持, 如有这类需求，请使用 v1.3.x LTS 版本。  
diff --git a/flutter/mmkv/CHANGELOG.md b/flutter/mmkv/CHANGELOG.md
@@ -1,4 +1,10 @@
 # MMKV for Flutter Change Log
+## v2.2.4 / 2025-09-25
+This is a hotfix release mainly for iOS/macOS CocoaPods users.
+
+* Improve the performance of MMBuffer a little bit in some cases.
+* iOS/macOS: Make MMKV and MMKVCore podspec define modules.
+
 ## v2.2.3 / 2025-08-20
 This is a feature release that brings **full desktop support to Flutter**.
 * **Added Full Desktop Support**: MMKV for Flutter now officially supports **Windows**, **macOS**, and **Linux**.
diff --git a/flutter/mmkv/README.md b/flutter/mmkv/README.md
@@ -1,6 +1,6 @@
 [![license](https://img.shields.io/badge/license-BSD_3-brightgreen.svg?style=flat)](https://github.com/Tencent/MMKV/blob/master/LICENSE.TXT)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/MMKV/pulls)
-[![Release Version](https://img.shields.io/badge/release-2.2.3-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
+[![Release Version](https://img.shields.io/badge/release-2.2.4-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
 [![Platform](https://img.shields.io/badge/Platform-%20Android%20%7C%20iOS-brightgreen.svg)](https://github.com/Tencent/MMKV/wiki/home)
 
 MMKV is an **efficient**, **small**, **easy-to-use** mobile key-value storage framework used in the WeChat application. It's currently available on **Android** and **iOS**.
@@ -26,7 +26,7 @@ Add the following lines to `pubspec.yaml` on your app module. Then run `flutter
 
 ```yaml
 dependencies:
-  mmkv: "^2.2.3"
+  mmkv: "^2.2.4"
 ```
 
 If you already include MMKV native lib in your App, you need to upgrade to version newer than v2.0.0.  
diff --git a/flutter/mmkv/example/android/app/build.gradle b/flutter/mmkv/example/android/app/build.gradle
@@ -52,7 +52,7 @@ android {
     }
 
     dependencies {
-        implementation('com.tencent:mmkv:2.2.3')
+        implementation('com.tencent:mmkv:2.2.4')
 
         constraints {
             implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
diff --git a/flutter/mmkv/pubspec.yaml b/flutter/mmkv/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mmkv
 description: An efficient, small mobile key-value storage framework developed by WeChat. Works on Android & iOS.
-version: 2.2.3
+version: 2.2.4
 homepage: https://github.com/Tencent/mmkv
 repository: https://github.com/Tencent/MMKV/tree/master/flutter/mmkv
 
@@ -13,19 +13,19 @@ dependencies:
     sdk: flutter
   ffi: ^2.0.0
   mmkv_ios:
-   '>=2.2.3 <2.3.0'
+   '>=2.2.4 <2.3.0'
 #     path: ../mmkv_ios
   mmkv_android:
-    '>=2.2.3 <2.3.0'
+    '>=2.2.4 <2.3.0'
 #    path: ../mmkv_android
   mmkv_ohos:
-    '>=2.2.3 <2.3.0'
+    '>=2.2.4 <2.3.0'
 #    path: ../mmkv_ohos
   mmkv_win32:
-    '>=2.2.3 <2.3.0'
+    '>=2.2.4 <2.3.0'
 #    path: ../mmkv_win32
   mmkv_linux:
-    '>=2.2.3 <2.3.0'
+    '>=2.2.4 <2.3.0'
 #    path: ../mmkv_linux
   mmkv_platform_interface:
     '>=2.2.3 <2.3.0'
diff --git a/flutter/mmkv_android/CHANGELOG.md b/flutter/mmkv_android/CHANGELOG.md
@@ -1,4 +1,7 @@
 # MMKV Platform Android Change Log
+## v2.2.4 / 2025-09-25
+Keep up with native lib v2.2.4.
+
 ## v2.2.3 / 2025-08-20
 Keep up with native lib v2.2.3.
 
diff --git a/flutter/mmkv_android/android/build.gradle b/flutter/mmkv_android/android/build.gradle
@@ -34,6 +34,6 @@ android {
     }
 
     dependencies {
-        implementation 'com.tencent:mmkv:[2.2.3, 2.3)'
+        implementation 'com.tencent:mmkv:[2.2.4, 2.3)'
     }
 }
diff --git a/flutter/mmkv_android/pubspec.yaml b/flutter/mmkv_android/pubspec.yaml
@@ -1,7 +1,7 @@
 name: mmkv_android
 description: Android platform implementation of MMKV.
 repository: https://github.com/Tencent/MMKV/tree/master/flutter/mmkv_android
-version: 2.2.3
+version: 2.2.4
 homepage: https://github.com/Tencent/mmkv
 
 environment:
diff --git a/flutter/mmkv_ios/CHANGELOG.md b/flutter/mmkv_ios/CHANGELOG.md
@@ -1,4 +1,7 @@
 # MMKV Platform iOS Change Log
+## v2.2.4 / 2025-09-25
+* Keep up with native lib v2.2.4.
+
 ## v2.2.3 / 2025-08-20
 * Support macOS.
 * Keep up with native lib v2.2.3.
diff --git a/flutter/mmkv_ios/darwin/mmkv_ios.podspec b/flutter/mmkv_ios/darwin/mmkv_ios.podspec
@@ -5,7 +5,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'mmkv_ios'
-  s.version          = '2.2.3'
+  s.version          = '2.2.4'
   s.summary          = 'MMKV is a cross-platform key-value storage framework developed by WeChat.'
   s.description      = <<-DESC
   The MMKV, for Flutter.
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
   s.osx.dependency 'FlutterMacOS'
   s.ios.deployment_target = '13.0'
   s.osx.deployment_target = '10.15'
-  s.dependency 'MMKV', '>= 2.2.3', '< 2.3'
+  s.dependency 'MMKV', '>= 2.2.4', '< 2.3'
   s.osx.framework = 'FlutterMacOS'
 
 # Flutter.framework does not contain a i386 slice.
diff --git a/flutter/mmkv_ios/pubspec.yaml b/flutter/mmkv_ios/pubspec.yaml
@@ -1,7 +1,7 @@
 name: mmkv_ios
 description: iOS platform implementation of MMKV.
 repository: https://github.com/Tencent/MMKV/tree/master/flutter/mmkv_ios
-version: 2.2.3
+version: 2.2.4
 homepage: https://github.com/Tencent/mmkv
 
 environment:
diff --git a/flutter/mmkv_linux/CHANGELOG.md b/flutter/mmkv_linux/CHANGELOG.md
@@ -1,3 +1,6 @@
 # MMKV Platform Linux Change Log
+## v2.2.4 / 2025-09-25
+* Keep up with native lib v2.2.4.
+
 ## v2.2.3 / 2025-08-20
 The initial release.
diff --git a/flutter/mmkv_linux/linux/CMakeLists.txt b/flutter/mmkv_linux/linux/CMakeLists.txt
@@ -9,7 +9,7 @@ project(${PROJECT_NAME} LANGUAGES CXX)
 
 # Set the version of MMKV to use. This should match the version used in the
 # mmkv_flutter plugin.
-set(MMKV_VERSION "v2.2.3")
+set(MMKV_VERSION "v2.2.4")
 
 include(FetchContent)
 FetchContent_Declare(mmkv
diff --git a/flutter/mmkv_linux/pubspec.yaml b/flutter/mmkv_linux/pubspec.yaml
@@ -1,7 +1,7 @@
 name: mmkv_linux
 description: Linux platform implementation of MMKV.
 repository: https://github.com/Tencent/MMKV/tree/master/flutter/mmkv_linux
-version: 2.2.3
+version: 2.2.4
 homepage: https://github.com/Tencent/mmkv
 
 environment:
diff --git a/flutter/mmkv_ohos/CHANGELOG.md b/flutter/mmkv_ohos/CHANGELOG.md
@@ -1,4 +1,7 @@
 # MMKV Platform OHOS Change Log
+## v2.2.4 / 2025-09-25
+* Keep up with native lib v2.2.4.
+
 ## v2.2.3 / 2025-08-20
 Keep up with native lib v2.2.3.
 
diff --git a/flutter/mmkv_ohos/ohos/oh-package.json5 b/flutter/mmkv_ohos/ohos/oh-package.json5
@@ -1,13 +1,13 @@
 {
   "name": "mmkv_ohos",
-  "version": "2.2.1",
+  "version": "2.2.4",
   "description": "Please describe the basic information.",
   "main": "index.ets",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
     "@ohos/flutter_ohos": "file:./har/flutter.har",
-    "@tencent/mmkv": ">=2.2.3 <2.3"
+    "@tencent/mmkv": ">=2.2.4 <2.3"
 //    "@tencent/mmkv": "file:/Users/lingol/Developer/mmkv/OpenHarmony/MMKV/build/default/outputs/default/MMKV.har"
   },
   "devDependencies": {},
diff --git a/flutter/mmkv_ohos/pubspec.yaml b/flutter/mmkv_ohos/pubspec.yaml
@@ -1,7 +1,7 @@
 name: mmkv_ohos
 description: OHOS platform implementation of MMKV.
 repository: https://github.com/Tencent/MMKV/tree/master/flutter/mmkv_ohos
-version: 2.2.3
+version: 2.2.4
 homepage: https://github.com/Tencent/mmkv
 
 environment:
diff --git a/flutter/mmkv_win32/CHANGELOG.md b/flutter/mmkv_win32/CHANGELOG.md
@@ -1,3 +1,6 @@
 # MMKV Platform Windows Change Log
+## v2.2.4 / 2025-09-25
+* Keep up with native lib v2.2.4.
+
 ## v2.2.3 / 2025-08-20
 The initial release.
diff --git a/flutter/mmkv_win32/pubspec.yaml b/flutter/mmkv_win32/pubspec.yaml
@@ -1,7 +1,7 @@
 name: mmkv_win32
 description: Windows platform implementation of MMKV.
 repository: https://github.com/Tencent/MMKV/tree/master/flutter/mmkv_win32
-version: 2.2.3
+version: 2.2.4
 homepage: https://github.com/Tencent/mmkv
 
 environment:
diff --git a/flutter/mmkv_win32/windows/CMakeLists.txt b/flutter/mmkv_win32/windows/CMakeLists.txt
@@ -14,7 +14,7 @@ cmake_policy(VERSION 3.14...3.25)
 
 # Set the version of MMKV to use. This should match the version used in the
 # mmkv_flutter plugin.
-set(MMKV_VERSION "v2.2.3")
+set(MMKV_VERSION "v2.2.4")
 
 include(FetchContent)
 FetchContent_Declare(mmkv
diff --git a/iOS/MMKV/MMKV.xcodeproj/project.pbxproj b/iOS/MMKV/MMKV.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -170,11 +170,8 @@ MMBuffer &MMBuffer::operator=(MMBuffer &&other) noexcept {`
`170`	`170`	`#endif`
`171`	`171`	`other.detach();`
`172`	`172`	`} else {`
`173`		`- uint8_t tmp[SmallBufferSize()];`
`174`		`- memcpy(tmp, other.paddedBuffer, other.paddedSize);`
`175`		`- memcpy(other.paddedBuffer, paddedBuffer, paddedSize);`
`176`		`- memcpy(paddedBuffer, tmp, other.paddedSize);`
`177`		`- std::swap(paddedSize, other.paddedSize);`
	`173`	`+ paddedSize = other.paddedSize;`
	`174`	`+ memcpy(paddedBuffer, other.paddedBuffer, other.paddedSize);`
`178`	`175`	`}`
`179`	`176`	`}`
`180`	`177`