Merge pull request #1250 from Tencent/dev

for v1.3.4
Tencent · Mar 15, 2024 · 591140f · 591140f
2 parents 1bc1068 + 2e9fdcb
commit 591140f
Show file tree

Hide file tree

Showing 37 changed files with 509 additions and 114 deletions.
diff --git a/Android/MMKV/gradle.properties b/Android/MMKV/gradle.properties
@@ -14,9 +14,9 @@ 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=1.3.3
+VERSION_NAME_PREFIX=1.3.4
 #VERSION_NAME_SUFFIX=-SNAPSHOT
 VERSION_NAME_SUFFIX=
 
 RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2
-SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots
+SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots
diff --git a/Android/MMKV/mmkvdemo/build.gradle b/Android/MMKV/mmkvdemo/build.gradle
@@ -77,9 +77,9 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':mmkv')
-//    implementation 'com.tencent:mmkv:1.3.3'
-//    implementation 'com.tencent:mmkv-static:1.3.3' // this is identical to 'com.tencent:mmkv'
-//    implementation 'com.tencent:mmkv-shared:1.3.3'
+//    implementation 'com.tencent:mmkv:1.3.4'
+//    implementation 'com.tencent:mmkv-static:1.3.4' // this is identical to 'com.tencent:mmkv'
+//    implementation 'com.tencent:mmkv-shared:1.3.4'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
 # MMKV Change Log
+## v1.3.4 / 2024-03-15
+### Changes for All platforms
+* Make `trim()` more robust in multi-process mode.
+
+### iOS & macOS
+* Support visionOS.
+
+### POSIX
+* Fix a compile error on `::unlink()`.
+
 ## v1.3.3 / 2024-01-25
 ### Changes for All platforms
 * Add `removeStorage()` static method to safely delete underlying files of an MMKV instance.

diff --git a/Core/Core.xcodeproj/project.pbxproj b/Core/Core.xcodeproj/project.pbxproj
@@ -503,6 +503,7 @@
 				SDKROOT = iphoneos;
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				XROS_DEPLOYMENT_TARGET = 1.0;
 			};
 			name = Debug;
 		};
@@ -559,6 +560,7 @@
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 				VALIDATE_PRODUCT = YES;
 				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				XROS_DEPLOYMENT_TARGET = 1.0;
 			};
 			name = Release;
 		};
@@ -582,7 +584,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = "";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos xrsimulator xros";
 				TARGETED_DEVICE_FAMILY = "1,2,3";
 			};
 			name = Debug;
@@ -608,7 +610,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = "";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos xrsimulator xros";
 				TARGETED_DEVICE_FAMILY = "1,2,3";
 			};
 			name = Release;

diff --git a/Core/MMKVPredef.h b/Core/MMKVPredef.h
@@ -34,7 +34,7 @@
 #include <vector>
 #include <unordered_map>
 
-constexpr auto MMKV_VERSION = "v1.3.3";
+constexpr auto MMKV_VERSION = "v1.3.4";
 
 #ifdef DEBUG
 #    define MMKV_DEBUG

diff --git a/Core/MMKV_IO.cpp b/Core/MMKV_IO.cpp
@@ -49,6 +49,10 @@
 #    endif
 #endif // MMKV_APPLE
 
+#ifndef MMKV_WIN32
+#    include <unistd.h>
+#endif
+
 using namespace std;
 using namespace mmkv;
 using KVHolderRet_t = std::pair<bool, KeyValueHolder>;
@@ -1384,6 +1388,7 @@ void MMKV::trim() {
     SCOPED_LOCK(m_lock);
     MMKVInfo("prepare to trim %s", m_mmapID.c_str());
 
+    SCOPED_LOCK(m_exclusiveProcessLock);
     checkLoadData();
     if (!isFileValid()) {
         MMKVWarning("[%s] file not valid", m_mmapID.c_str());
@@ -1396,7 +1401,6 @@ void MMKV::trim() {
     } else if (m_file->getFileSize() <= m_expectedCapacity) {
         return;
     }
-    SCOPED_LOCK(m_exclusiveProcessLock);
 
     fullWriteback();
     auto oldSize = m_file->getFileSize();

diff --git a/Core/MemoryFile.cpp b/Core/MemoryFile.cpp
@@ -35,6 +35,7 @@
 #    include <sys/file.h>
 #    include <dirent.h>
 #    include <cstring>
+#    include <unistd.h>
 
 using namespace std;
 

diff --git a/Core/MemoryFile_OSX.cpp b/Core/MemoryFile_OSX.cpp
@@ -53,6 +53,7 @@ void tryResetFileProtection(const string &path) {
 #ifdef MMKV_APPLE
 
 #include <copyfile.h>
+#include <unistd.h>
 
 namespace mmkv {
 
@@ -77,7 +78,7 @@ bool tryAtomicRename(const char *src, const char *dst) {
         }
     }
 
-    unlink(src);
+    ::unlink(src);
 
     return true;
 }

diff --git a/MMKV.podspec b/MMKV.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MMKV"
-  s.version      = "1.3.3"
+  s.version      = "1.3.4"
   s.summary      = "MMKV is a cross-platform key-value storage framework developed by WeChat."
 
   s.description  = <<-DESC
@@ -17,6 +17,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = "11.0"
   s.osx.deployment_target = "10.13"
   s.tvos.deployment_target = "13.0"
+  s.visionos.deployment_target = "1.0"
 
   s.source       = { :git => "https://github.com/Tencent/MMKV.git", :tag => "v#{s.version}" }
   s.source_files =  "iOS/MMKV/MMKV", "iOS/MMKV/MMKV/*.{h,mm,hpp}"
@@ -31,7 +32,7 @@ Pod::Spec.new do |s|
     "CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF" => "NO",
   }
 
-  s.dependency 'MMKVCore', '~> 1.3.3'
+  s.dependency 'MMKVCore', '~> 1.3.4'
 
 end
 
diff --git a/MMKV.xcworkspace/contents.xcworkspacedata b/MMKV.xcworkspace/contents.xcworkspacedata
diff --git a/MMKVAppExtension.podspec b/MMKVAppExtension.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MMKVAppExtension"
-  s.version      = "1.3.3"
+  s.version      = "1.3.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', '~> 1.3.3'
+  s.dependency 'MMKVCore', '~> 1.3.4'
 
 end
 
diff --git a/MMKVCore.podspec b/MMKVCore.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MMKVCore"
-  s.version      = "1.3.3"
+  s.version      = "1.3.4"
   s.summary      = "MMKVCore for MMKV. MMKV is a cross-platform key-value storage framework developed by WeChat."
 
   s.description  = <<-DESC
@@ -18,6 +18,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.13"
   s.tvos.deployment_target = "13.0"
   s.watchos.deployment_target = "4.0"
+  s.visionos.deployment_target = "1.0"
 
   s.source       = { :git => "https://github.com/Tencent/MMKV.git", :tag => "v#{s.version}" }
   s.source_files = "Core", "Core/*.{h,cpp,hpp}", "Core/aes/*", "Core/aes/openssl/*", "Core/crc32/*.h"

diff --git a/MMKVWatchExtension.podspec b/MMKVWatchExtension.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MMKVWatchExtension"
-  s.version      = "1.3.3"
+  s.version      = "1.3.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', '~> 1.3.3'
+  s.dependency 'MMKVCore', '~> 1.3.4'
 
 end
 
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-1.3.3-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
+[![Release Version](https://img.shields.io/badge/release-1.3.4-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
 [![Platform](https://img.shields.io/badge/Platform-%20Android%20%7C%20iOS%2FmacOS%20%7C%20Win32%20%7C%20POSIX-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:1.3.3'
-    // replace "1.3.3" with any available version
+    implementation 'com.tencent:mmkv:1.3.4'
+    // replace "1.3.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:1.3.3'
-    // replace "1.3.3" with any available version
+    implementation 'com.tencent:mmkv:1.3.4'
+    // replace "1.3.4" with any available version
 }
 ```
 更多安装指引参考 [Android Setup](https://github.com/Tencent/MMKV/wiki/android_setup_cn)。

diff --git a/flutter/CHANGELOG.md b/flutter/CHANGELOG.md
@@ -1,4 +1,8 @@
 # MMKV for Flutter Change Log
+
+## v1.3.4 / 2024-03-15
+* Make `trim()` more robust in multi-process mode.
+
 ## v1.3.3 / 2024-01-25
 * Add `removeStorage()` static method to safely delete underlying files of an MMKV instance.
 * Add protection from a potential crash of a multi-process MMKV loading due to the MMKV file not being valid.

diff --git a/flutter/README.md b/flutter/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-1.3.3-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
+[![Release Version](https://img.shields.io/badge/release-1.3.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,11 +26,11 @@ Add the following lines to `pubspec.yaml` on your app module. Then run `flutter
 
 ```yaml
 dependencies:
-  mmkv: ">=1.3.3"
+  mmkv: ">=1.3.4"
   ...
 ```
 
-If you already include MMKV native lib in your App, you need to upgrade to version newer than v1.3.3.  
+If you already include MMKV native lib in your App, you need to upgrade to version newer than v1.3.4.  
 
 #### iOS  
 To avoid conflict of the native lib name 'libMMKV.so' on iOS, we need to **change the plugin name 'mmkv' to 'mmkvflutter'**.  

diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle
@@ -34,6 +34,6 @@ android {
     }
 
     dependencies {
-        implementation 'com.tencent:mmkv:1.3.3'
+        implementation 'com.tencent:mmkv:1.3.4'
     }
 }
diff --git a/flutter/example/android/app/build.gradle b/flutter/example/android/app/build.gradle
@@ -34,7 +34,7 @@ android {
 
     defaultConfig {
         applicationId "com.tencent.mmkv_example"
-        minSdkVersion 16
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -49,7 +49,7 @@ android {
     }
 
     dependencies {
-        implementation('com.tencent:mmkv:1.3.3')
+        implementation('com.tencent:mmkv:1.3.4')
 
         constraints {
             implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {