test pr for v2.0.0

Android/MMKV/build.gradle

@@ -25,7 +25,7 @@ task clean(type: Delete) {
 }
 
 ext {
-    minSdkVersion = 21
+    minSdkVersion = 23
     compileSdkVersion = 34
     targetSdkVersion = compileSdkVersion
     supportLibVersion = "25.4.0"

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=1.3.9
+VERSION_NAME_PREFIX=2.0.0
 #VERSION_NAME_SUFFIX=-SNAPSHOT
 VERSION_NAME_SUFFIX=
 

Android/MMKV/mmkv/build.gradle

@@ -11,8 +11,8 @@ android {
         externalNativeBuild {
             cmake {
                 // uncomment this line to support 32-bit ABIs (armeabi-v7a & x86)
-                abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-                // abiFilters 'arm64-v8a', 'x86_64'
+                // abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+                abiFilters 'arm64-v8a', 'x86_64'
             }
         }
         ndkVersion = '26.3.11579264'
@@ -23,7 +23,8 @@ android {
             minifyEnabled false
             externalNativeBuild {
                 cmake {
-                    cppFlags "-fvisibility=hidden", "-funwind-tables", "-fasynchronous-unwind-tables", "-O2"
+                    cppFlags "-fvisibility=hidden", "-funwind-tables", "-fasynchronous-unwind-tables", "-O2",
+                            "-Wl,-z,max-page-size=16384"
                 }
             }
             consumerProguardFiles 'proguard-rules.pro'
@@ -43,7 +44,11 @@ android {
     lintOptions {
         tasks.lint.enabled = false
     }
-
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
     flavorDimensions "stl_mode"
     productFlavors {
         DefaultCpp {

Android/MMKV/mmkv/src/main/cpp/flutter-bridge.cpp

@@ -37,9 +37,18 @@ extern string g_android_tmpDir;
 
 #    define MMKV_EXPORT extern "C" __attribute__((visibility("default"))) __attribute__((used))
 
-MMKV_EXPORT void mmkvInitialize_v1(const char *rootDir, const char *cacheDir, int32_t sdkInt, int32_t logLevel) {
+using LogCallback_t = void (*)(uint32_t level, const char *file, int32_t line, const char *funcname, const char *message);
+LogCallback_t g_logCallback = nullptr;
+
+static void myLogHandler(MMKVLogLevel level, const char *file, int line, const char *function, MMKVLog_t message) {
+    if (g_logCallback) {
+        g_logCallback(level, file, line, function, message.c_str());
+    }
+}
+
+MMKV_EXPORT void *mmkvInitialize_v2(const char *rootDir, const char *cacheDir, int32_t sdkInt, int32_t logLevel, LogCallback_t callback) {
     if (!rootDir) {
-        return;
+        return nullptr;
     }
     if (cacheDir) {
         g_android_tmpDir = string(cacheDir);
@@ -52,11 +61,21 @@ MMKV_EXPORT void mmkvInitialize_v1(const char *rootDir, const char *cacheDir, in
     MMKVInfo("current API level = %d, libc++_shared=?", g_android_api);
 #endif
 
-    MMKV::initializeMMKV(rootDir, (MMKVLogLevel) logLevel);
+    if (callback) {
+        g_logCallback = callback;
+        MMKV::initializeMMKV(rootDir, (MMKVLogLevel) logLevel, myLogHandler);
+    } else {
+        MMKV::initializeMMKV(rootDir, (MMKVLogLevel) logLevel);
+    }
+    return (void *) MMKV::getRootDir().c_str();
+}
+
+MMKV_EXPORT void mmkvInitialize_v1(const char *rootDir, const char *cacheDir, int32_t sdkInt, int32_t logLevel) {
+    mmkvInitialize_v2(rootDir, cacheDir, sdkInt, logLevel, nullptr);
 }
 
 MMKV_EXPORT void mmkvInitialize(const char *rootDir, int32_t logLevel) {
-    mmkvInitialize_v1(rootDir, nullptr, 0, logLevel);
+    mmkvInitialize_v2(rootDir, nullptr, 0, logLevel, nullptr);
 }
 
 MMKV_EXPORT void *getMMKVWithID(const char *mmapID, int32_t mode, const char *cryptKey, const char *rootPath, size_t expectedCapacity) {
@@ -566,4 +585,64 @@ MMKV_EXPORT bool removeStorage(const char *mmapID, const char *rootPath) {
     return MMKV::removeStorage(mmapID, nullptr);
 }
 
+MMKV_EXPORT bool isMultiProcess(void *handle) {
+    MMKV *kv = static_cast<MMKV *>(handle);
+    if (kv) {
+        return kv->isMultiProcess();
+    }
+    return false;
+}
+
+MMKV_EXPORT bool isReadOnly(void *handle) {
+    MMKV *kv = static_cast<MMKV *>(handle);
+    if (kv) {
+        return kv->isReadOnly();
+    }
+    return false;
+}
+
+using ErrorCallback_t = int (*)(const char *mmapID, int32_t errorType);
+static ErrorCallback_t g_errorCallback = nullptr;
+
+static MMKVRecoverStrategic myErrorHandler(const std::string &mmapID, MMKVErrorType errorType) {
+    if (g_errorCallback) {
+        return (MMKVRecoverStrategic) g_errorCallback(mmapID.c_str(), errorType);
+    }
+    return OnErrorDiscard;
+}
+
+MMKV_EXPORT void registerErrorHandler(ErrorCallback_t callback) {
+    g_errorCallback = callback;
+    if (callback) {
+        MMKV::registerErrorHandler(myErrorHandler);
+    } else {
+        MMKV::unRegisterErrorHandler();
+    }
+}
+
+using ContenctChangeCallback_t = void (*)(const char *mmapID);
+static ContenctChangeCallback_t g_contentChanceCallback = nullptr;
+
+static void myContentChangeHandler(const std::string &mmapID) {
+    if (g_contentChanceCallback) {
+        g_contentChanceCallback(mmapID.c_str());
+    }
+}
+
+MMKV_EXPORT void registerContentChangeNotify(ContenctChangeCallback_t callback) {
+    g_contentChanceCallback = callback;
+    if (callback) {
+        MMKV::registerContentChangeHandler(myContentChangeHandler);
+    } else {
+        MMKV::unRegisterContentChangeHandler();
+    }
+}
+
+MMKV_EXPORT void checkContentChanged(void *handle) {
+    MMKV *kv = static_cast<MMKV *>(handle);
+    if (kv) {
+        kv->checkContentChanged();
+    }
+}
+
 #endif // MMKV_DISABLE_FLUTTER

Android/MMKV/mmkv/src/main/cpp/native-bridge.cpp

@@ -1064,6 +1064,22 @@ MMKV_JNI void clearAllWithKeepingSpace(JNIEnv *env, jobject instance) {
     }
 }
 
+MMKV_JNI jboolean isMultiProcess(JNIEnv *env, jobject instance) {
+    MMKV *kv = getMMKV(env, instance);
+    if (kv) {
+        return (jboolean) kv->isMultiProcess();
+    }
+    return jboolean(false);
+}
+
+MMKV_JNI jboolean isReadOnly(JNIEnv *env, jobject instance) {
+    MMKV *kv = getMMKV(env, instance);
+    if (kv) {
+        return (jboolean) kv->isReadOnly();
+    }
+    return jboolean(false);
+}
+
 } // namespace mmkv
 
 static JNINativeMethod g_methods[] = {
@@ -1146,6 +1162,8 @@ static JNINativeMethod g_methods[] = {
     {"isEncryptionEnabled", "()Z", (void *) mmkv::isEncryptionEnabled},
     {"isExpirationEnabled", "()Z", (void *) mmkv::isExpirationEnabled},
     {"clearAllWithKeepingSpace", "()V", (void *) mmkv::clearAllWithKeepingSpace},
+    {"isMultiProcess", "()Z", (void *) mmkv::isMultiProcess},
+    {"isReadOnly", "()Z", (void *) mmkv::isReadOnly},
 };
 
 static int registerNativeMethods(JNIEnv *env, jclass cls) {

Android/MMKV/mmkv/src/main/java/com/tencent/mmkv/MMKV.java

@@ -334,6 +334,11 @@ public static void setLogLevel(MMKVLogLevel level) {
 
     static private final int BACKUP_MODE = 1 << 4;
 
+    /**
+     * Read-only mode.
+     */
+    static public final int READ_ONLY_MODE = 1 << 5;
+
     /**
      * Create an MMKV instance with an unique ID (in single-process mode).
      *
@@ -1646,6 +1651,16 @@ private static void onContentChangedByOuterProcess(String mmapID) {
      */
     public native void checkContentChangedByOuterProcess();
 
+    /**
+     * Check if this instance is in multi-process mode.
+     */
+    public native boolean isMultiProcess();
+
+    /**
+     * Check if this instance is in read-only mode.
+     */
+    public native boolean isReadOnly();
+
     // jni
     private final long nativeHandle;
 

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.9'
-//    implementation 'com.tencent:mmkv-static:1.3.9' // this is identical to 'com.tencent:mmkv'
-//    implementation 'com.tencent:mmkv-shared:1.3.9'
+//    implementation 'com.tencent:mmkv:2.0.0'
+//    implementation 'com.tencent:mmkv-static:2.0.0' // this is identical to 'com.tencent:mmkv'
+//    implementation 'com.tencent:mmkv-shared:2.0.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'

Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/MainActivity.java

@@ -131,6 +131,7 @@ public void onClick(View v) {
 //        testFastNativeSpeed();
         testRemoveStorage();
         overrideTest();
+        testReadOnly();
     }
 
     private void testCompareBeforeSet() {
@@ -212,7 +213,12 @@ private void testInterProcessLogic() {
     private MMKV testMMKV(String mmapID, String cryptKey, boolean decodeOnly, String rootPath) {
         //MMKV kv = MMKV.defaultMMKV();
         MMKV kv = MMKV.mmkvWithID(mmapID, MMKV.SINGLE_PROCESS_MODE, cryptKey, rootPath);
+        testMMKV(kv, decodeOnly);
+        Log.i("MMKV", "isFileValid[" + kv.mmapID() + "]: " + MMKV.isFileValid(kv.mmapID(), rootPath));
+        return kv;
+    }
 
+    private void testMMKV(MMKV kv, boolean decodeOnly) {
         if (!decodeOnly) {
             kv.encode("bool", true);
         }
@@ -291,9 +297,6 @@ private MMKV testMMKV(String mmapID, String cryptKey, boolean decodeOnly, String
         //kv.clearAll();
         kv.clearMemoryCache();
         Log.i("MMKV", "allKeys: " + Arrays.toString(kv.allKeys()));
-        Log.i("MMKV", "isFileValid[" + kv.mmapID() + "]: " + MMKV.isFileValid(kv.mmapID(), rootPath));
-
-        return kv;
     }
 
     private void testImportSharedPreferences() {
@@ -915,4 +918,29 @@ private void encryptionTestKV(String key, String value) {
         }
         mmkv0.removeValueForKey(key);
     }
+
+    private void testReadOnly() {
+        final String name = "testReadOnly";
+        final String key = "readonly+key";
+        {
+            MMKV kv = MMKV.mmkvWithID(name, MMKV.SINGLE_PROCESS_MODE, key);
+            testMMKV(kv, false);
+            kv.close();
+        }
+
+        String path = MMKV.getRootDir() + "/" + name;
+        File file = new File(path);
+        file.setReadOnly();
+        File crcFile = new File(path + ".crc");
+        crcFile.setReadOnly();
+
+        MMKV kv = MMKV.mmkvWithID(name, MMKV.SINGLE_PROCESS_MODE | MMKV.READ_ONLY_MODE, key);
+        testMMKV(kv, true);
+
+        // also check if it tolerate update operations without crash
+        testMMKV(kv, false);
+
+        file.setWritable(true);
+        crcFile.setWritable(true);
+    }
 }

CHANGELOG.md

@@ -1,4 +1,28 @@
 # MMKV Change Log
+## v2.0.0 / 2024-10-21
+**This release is a breaking change release, especially for Android.**
+### Changes for All platforms
+* Add **readonly mode** support.
+* Fix a compile error when `MMKV_DISABLE_CRYPT` is defined and MMKV is built by source in DEBUG.
+
+### Android
+* Support 16K page size for Android 15.
+* Drop the support of **32-bit ABI**.
+* Bump the mini **SDK level to API 23**.
+
+### iOS / macOS
+* Add Mac Catalyst support
+
+### Flutter
+* Add add log/error/content-change callback.
+
+### HarmonyOS NEXT
+* Add add log/error/content-change callback.
+* Support obfuscation. For the time being, you will have to manually copy the content of MMKV's [consumer-rules.txt](https://github.com/Tencent/MMKV/blob/master/OpenHarmony/MMKV/consumer-rules.txt) into your App's obfuscation-rules.txt.
+
+### Win32
+* Replace `random()` with `rand()` to fix a compile error.
+
 ## v1.3.9 / 2024-07-26
 **This is a Long Term Support (LTS) release.**
 ### Changes for All platforms

Core/Core.xcodeproj/project.pbxproj

@@ -591,6 +591,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos xrsimulator xros";
 				TARGETED_DEVICE_FAMILY = "1,2,3";
+                SUPPORTS_MACCATALYST = YES;
 			};
 			name = Debug;
 		};
@@ -617,6 +618,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos xrsimulator xros";
 				TARGETED_DEVICE_FAMILY = "1,2,3";
+                SUPPORTS_MACCATALYST = YES;
 			};
 			name = Release;
 		};