react-native-mmkv 3.3.0 → 4.0.0-beta.0

package/android/CMakeLists.txt

@@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.9.0)
 project(ReactNativeMmkv)
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
+
+# Check for supported ABIs only
+if(NOT (ANDROID_ABI STREQUAL "arm64-v8a" OR ANDROID_ABI STREQUAL "x86_64"))
+    message(FATAL_ERROR "MMKV prefab does not support ABI: ${ANDROID_ABI}. Supported ABIs: arm64-v8a, x86_64")
+endif()
 
 # Compile sources
 add_library(
@@ -13,20 +18,24 @@ add_library(
         ../cpp/NativeMmkvModule.cpp
 )
 
-# Add headers search paths
-target_include_directories(react-native-mmkv PUBLIC ../MMKV/Core)
-target_include_directories(react-native-mmkv PUBLIC ../cpp)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../cpp)
 
-# Add MMKV core dependency
-add_subdirectory(../MMKV/Core core)
+# Find MMKV prefab package
+find_package(mmkv REQUIRED CONFIG)
 
 # Add android/log dependency
-find_library(log-lib log)
+find_library(android_log log)
+
+target_include_directories(
+        react-native-mmkv
+        PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/../cpp
+)
 
 target_link_libraries(
         react-native-mmkv
-        core                        # <-- MMKV core
-        ${log-lib}                  # <-- Logcat logger
+        mmkv::mmkv                  # <-- MMKV core (now manually configured)
+        ${android_log}              # <-- Logcat logger
         android                     # <-- Android JNI core
         react_codegen_RNMmkvSpec    # <-- Generated Specs from CodeGen
 )

package/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:7.2.2"
   }
 }
 
@@ -44,6 +44,7 @@ android {
 
   buildFeatures {
     buildConfig true
+    prefab true
   }
 
   buildTypes {
@@ -74,8 +75,8 @@ android {
 }
 
 repositories {
-  mavenCentral()
   google()
+  mavenCentral()
 }
 
 
@@ -84,6 +85,9 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
+
+  // Use the MMKV shared lib - includes C++ prefabs (shared STL for React Native compatibility)
+  implementation "com.tencent:mmkv-shared:2.2.3"
 }
 
 if (isNewArchitectureEnabled()) {

package/cpp/{MMKVManagedBuffer.h → ManagedMMBuffer.h}

@@ -1,5 +1,5 @@
 //
-//  ManagedBuffer.h
+//  ManagedMMBuffer.h
 //  react-native-mmkv
 //
 //  Created by Marc Rousavy on 25.03.24.
@@ -7,17 +7,17 @@
 
 #pragma once
 
-#include "MMKVManagedBuffer.h"
+#include "MmkvTypes.h" // IWYU pragma: keep
 #include <jsi/jsi.h>
 
 using namespace facebook;
 
 /**
- A jsi::MutableBuffer that manages mmkv::MMBuffer memory (by ownership).
+ A jsi::MutableBuffer that manages MMBuffer memory (by ownership).
  */
-class MMKVManagedBuffer : public jsi::MutableBuffer {
+class ManagedMMBuffer : public jsi::MutableBuffer {
 public:
-  explicit MMKVManagedBuffer(mmkv::MMBuffer&& buffer) : _buffer(std::move(buffer)) {}
+  explicit ManagedMMBuffer(MMBuffer&& buffer) : _buffer(std::move(buffer)) {}
 
   uint8_t* data() override {
     return static_cast<uint8_t*>(_buffer.getPtr());
@@ -28,5 +28,5 @@ public:
   }
 
 private:
-  mmkv::MMBuffer _buffer;
+  MMBuffer _buffer;
 };

package/cpp/MmkvHostObject.cpp

@@ -7,9 +7,8 @@
 //
 
 #include "MmkvHostObject.h"
-#include "MMKVManagedBuffer.h"
+#include "ManagedMMBuffer.h"
 #include "MmkvLogger.h"
-#include <MMKV.h>
 #include <string>
 #include <vector>
 
@@ -28,7 +27,7 @@ MmkvHostObject::MmkvHostObject(const facebook::react::MMKVConfig& config) {
   MMKVMode mode = getMMKVMode(config);
   if (config.readOnly.has_value() && config.readOnly.value()) {
     MmkvLogger::log("RNMMKV", "Instance is read-only!");
-    mode = mode | MMKVMode::MMKV_READ_ONLY;
+    mode = mode | mmkv::MMKV_READ_ONLY;
   }
 
 #ifdef __APPLE__
@@ -71,14 +70,14 @@ std::vector<jsi::PropNameID> MmkvHostObject::getPropertyNames(jsi::Runtime& rt)
 
 MMKVMode MmkvHostObject::getMMKVMode(const facebook::react::MMKVConfig& config) {
   if (!config.mode.has_value()) {
-    return MMKVMode::MMKV_SINGLE_PROCESS;
+    return mmkv::MMKV_SINGLE_PROCESS;
   }
   react::NativeMmkvMode mode = config.mode.value();
   switch (mode) {
     case react::NativeMmkvMode::SINGLE_PROCESS:
-      return MMKVMode::MMKV_SINGLE_PROCESS;
+      return mmkv::MMKV_SINGLE_PROCESS;
     case react::NativeMmkvMode::MULTI_PROCESS:
-      return MMKVMode::MMKV_MULTI_PROCESS;
+      return mmkv::MMKV_MULTI_PROCESS;
     default:
       [[unlikely]] throw std::runtime_error("Invalid MMKV Mode value!");
   }
@@ -221,12 +220,18 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
           }
 
           std::string keyName = arguments[0].getString(runtime).utf8(runtime);
-          mmkv::MMBuffer buffer;
+          MMBuffer buffer;
+#ifdef __OBJC__
+          // iOS: Convert std::string to NSString* for MMKVCore pod compatibility
+          bool hasValue = instance->getBytes(@(keyName.c_str()), buffer);
+#else
+          // Android/other platforms: Use std::string directly (converts to std::string_view)
           bool hasValue = instance->getBytes(keyName, buffer);
+#endif
           if (!hasValue) [[unlikely]] {
             return jsi::Value::undefined();
           }
-          auto mutableData = std::make_shared<MMKVManagedBuffer>(std::move(buffer));
+          auto mutableData = std::make_shared<ManagedMMBuffer>(std::move(buffer));
           return jsi::ArrayBuffer(runtime, mutableData);
         });
   }

package/cpp/MmkvHostObject.h

@@ -8,12 +8,11 @@
 
 #pragma once
 
-#include "MMKV.h"
+#include "MmkvTypes.h" // IWYU pragma: keep
 #include "NativeMmkvModule.h"
 #include <jsi/jsi.h>
 
 using namespace facebook;
-using namespace mmkv;
 
 class MmkvHostObject : public jsi::HostObject {
 public:

package/cpp/MmkvTypes.h

@@ -0,0 +1,50 @@
+//
+//  MmkvTypes.h
+//  react-native-mmkv
+//
+//  Created by Brad Anderson on 10.08.2025.
+//  Platform-specific MMKV type unification header
+//
+
+#pragma once
+
+// Platform-specific MMKV includes
+#ifdef __ANDROID__
+#include <MMKV/MMKV.h>
+
+// On Android, bring global namespace types into mmkv namespace for consistency
+namespace mmkv {
+using MMKV = ::MMKV;
+using MMKVMode = ::MMKVMode;
+using MMKVLogLevel = ::MMKVLogLevel;
+
+// Constants - bring into mmkv namespace
+constexpr auto MMKVLogDebug = ::MMKVLogDebug;
+constexpr auto MMKVLogInfo = ::MMKVLogInfo;
+constexpr auto MMKVLogWarning = ::MMKVLogWarning;
+constexpr auto MMKVLogError = ::MMKVLogError;
+constexpr auto MMKVLogNone = ::MMKVLogNone;
+
+constexpr auto MMKV_SINGLE_PROCESS = ::MMKV_SINGLE_PROCESS;
+constexpr auto MMKV_MULTI_PROCESS = ::MMKV_MULTI_PROCESS;
+constexpr auto MMKV_READ_ONLY = ::MMKVMode::MMKV_READ_ONLY;
+} // namespace mmkv
+
+#else
+#include <MMKVCore/MMKV.h>
+// iOS already has everything in mmkv:: namespace
+#endif
+
+/**
+ * Unified MMKV namespace usage for cross-platform compatibility.
+ *
+ * After including this header, use:
+ * - mmkv::MMKV for the main class
+ * - mmkv::MMKVMode for mode enum
+ * - mmkv::MMKVLogLevel for log level enum
+ * - mmkv::MMBuffer for buffer type
+ * - mmkv::MMKV_SINGLE_PROCESS / mmkv::MMKV_MULTI_PROCESS for modes
+ * - mmkv::MMKVLogDebug, etc. for log levels
+ */
+
+using namespace mmkv;

package/cpp/NativeMmkvModule.cpp

@@ -6,9 +6,9 @@
 //
 
 #include "NativeMmkvModule.h"
-#include "MMKV.h"
 #include "MmkvHostObject.h"
 #include "MmkvLogger.h"
+#include "MmkvTypes.h" // IWYU pragma: keep
 
 namespace facebook::react {
 
@@ -23,9 +23,9 @@ bool NativeMmkvModule::initialize(jsi::Runtime& runtime, std::string basePath) {
   MmkvLogger::log("RNMMKV", "Initializing MMKV at %s...", basePath.c_str());
 
 #ifdef DEBUG
-  MMKVLogLevel logLevel = MMKVLogDebug;
+  MMKVLogLevel logLevel = mmkv::MMKVLogDebug;
 #else
-  MMKVLogLevel logLevel = MMKVLogWarning;
+  MMKVLogLevel logLevel = mmkv::MMKVLogWarning;
 #endif
 
   MMKV::initializeMMKV(basePath, logLevel);

package/cpp/NativeMmkvModule.h

@@ -7,15 +7,8 @@
 
 #pragma once
 
-#if __has_include(<React-Codegen/RNMmkvSpecJSI.h>)
-// CocoaPods include (iOS)
-#include <React-Codegen/RNMmkvSpecJSI.h>
-#elif __has_include(<RNMmkvSpecJSI.h>)
-// CMake include on Android
 #include <RNMmkvSpecJSI.h>
-#else
-#error Cannot find react-native-mmkv spec! Try cleaning your cache and re-running CodeGen!
-#endif
+#include <string>
 
 namespace facebook::react {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mmkv",
-  "version": "3.3.0",
+  "version": "4.0.0-beta.0",
   "description": "The fastest key/value storage for React Native. ~30x faster than AsyncStorage! Works on Android, iOS and Web.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -10,7 +10,6 @@
   "files": [
     "cpp/**/*.h",
     "cpp/**/*.cpp",
-    "MMKV/Core",
     "android/src",
     "android/build.gradle",
     "android/CMakeLists.txt",
@@ -37,9 +36,8 @@
     "test": "jest",
     "typecheck": "tsc --noEmit",
     "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
-    "prepare": "git submodule update --init --recursive && bob build",
+    "prepare": "bob build",
     "prepack": "bob build",
-    "update-submodule": "git submodule update --remote --merge",
     "pods": "cd example && yarn pods",
     "release": "release-it",
     "codegen": "npx react-native codegen"
@@ -70,26 +68,27 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@firmnav/eslint-github-actions-formatter": "^1.0.1",
-    "@jamesacarr/eslint-formatter-github-actions": "^0.2.0",
-    "@react-native-community/cli-types": "^15.1.3",
-    "@react-native/eslint-config": "^0.77.1",
-    "@release-it/conventional-changelog": "^9.0.1",
-    "@testing-library/react-native": "^13.0.1",
-    "@types/jest": "^29.5.13",
-    "@types/react": "^18.3.11",
-    "del-cli": "^6.0.0",
-    "eslint": "^8.51.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "jest": "^29.7.0",
-    "prettier": "^3.3.3",
-    "react": "^18.3.1",
-    "react-native": "^0.77.1",
-    "react-native-builder-bob": "^0.37.0",
+    "@firmnav/eslint-github-actions-formatter": "1.0.1",
+    "@jamesacarr/eslint-formatter-github-actions": "0.2.0",
+    "@react-native-community/cli": "19.1.1",
+    "@react-native-community/cli-types": "18.0.0",
+    "@react-native/eslint-config": "0.77.1",
+    "@release-it/conventional-changelog": "9.0.1",
+    "@testing-library/react-native": "13.0.1",
+    "@types/jest": "29.5.13",
+    "@types/react": "18.3.11",
+    "del-cli": "6.0.0",
+    "eslint": "8.51.0",
+    "eslint-config-prettier": "9.0.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "jest": "29.7.0",
+    "prettier": "3.3.3",
+    "react": "18.3.1",
+    "react-native": "0.77.1",
+    "react-native-builder-bob": "0.37.0",
     "react-test-renderer": "18.3.1",
-    "release-it": "^17.10.0",
-    "typescript": "^5.5.4"
+    "release-it": "17.10.0",
+    "typescript": "5.5.4"
   },
   "peerDependencies": {
     "react": "*",

package/react-native-mmkv.podspec

@@ -1,7 +1,6 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::UI.puts "[react-native-mmkv] Thank you for using react-native-mmkv ❤️"
 Pod::UI.puts "[react-native-mmkv] If you enjoy using react-native-mmkv, please consider sponsoring this project: https://github.com/sponsors/mrousavy"
@@ -18,21 +17,16 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/mrousavy/react-native-mmkv.git", :tag => "#{s.version}" }
 
   s.pod_target_xcconfig = {
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
-    "CLANG_CXX_LIBRARY" => "libc++",
-    "CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF" => "NO",
-    # FORCE_POSIX ensures we are using C++ types instead of Objective-C types for MMKV.
-    "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FORCE_POSIX",
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
   }
   s.compiler_flags = '-x objective-c++'
   s.libraries    = "z", "c++"
   s.source_files = [
     # react-native-mmkv
     "ios/**/*.{h,m,mm}",
-    "cpp/**/*.{hpp,cpp,c,h}",
-    # MMKV/Core
-    "MMKV/Core/**/*.{h,cpp,hpp,S}",
+    "cpp/**/*.{hpp,cpp,c,h}"
   ]
 
+  s.dependency 'MMKVCore', '>= 2.2.3'
   install_modules_dependencies(s)
 end

package/react-native.config.js

@@ -17,4 +17,13 @@ module.exports = {
       },
     },
   },
+  // Codegen configuration for TurboModules
+  codegenConfig: {
+    name: 'RNMmkvSpec',
+    type: 'modules',
+    jsSrcsDir: 'src',
+    android: {
+      javaPackageName: 'com.mrousavy.mmkv',
+    },
+  },
 };

package/MMKV/Core/CMakeLists.txt

@@ -1,172 +0,0 @@
-#
-# Tencent is pleased to support the open source community by making
-# MMKV available.
-#
-# Copyright (C) 2019 THL A29 Limited, a Tencent company.
-# All rights reserved.
-#
-# Licensed under the BSD 3-Clause License (the "License"); you may not use
-# this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-#       https://opensource.org/licenses/BSD-3-Clause
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Sets the minimum version of CMake required to build the native library.
-
-cmake_minimum_required(VERSION 3.10.0)
-
-IF(APPLE)
-    # tell ranlib to ignore empty compilation units
-    SET(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
-    SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
-    # prevents ar from invoking ranlib, let CMake do it
-    SET(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> qc -S <TARGET> <LINK_FLAGS> <OBJECTS>")
-    SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> qc -S <TARGET> <LINK_FLAGS> <OBJECTS>")
-
-    add_compile_definitions(FORCE_POSIX)
-ENDIF()
-
-set(can_use_assembler TRUE)
-enable_language(ASM)
-IF("${ANDROID_ABI}" STREQUAL "arm64-v8a")
-    SET(ASM_OPTIONS "-x assembler-with-cpp")
-    SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS} -march=armv8+crypto -D__ANDROID__")
-ELSEIF("${ANDROID_ABI}" STREQUAL "armeabi-v7a")
-    SET(ASM_OPTIONS "-x assembler-with-cpp")
-    SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS} -march=armv7a -D__ANDROID__")
-ELSEIF("${ANDROID_ABI}" STREQUAL "armeabi")
-    SET(ASM_OPTIONS "-x assembler-with-cpp")
-    SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS} -march=armv5 -D__ANDROID__")
-ENDIF()
-
-#include(CMakePrintHelpers)
-#cmake_print_variables(CMAKE_SYSTEM_PROCESSOR OHOS OHOS_ARCH CFLAGS ASM_OPTIONS CMAKE_ASM_FLAGS)
-
-IF(OHOS)
-    IF("${OHOS_ARCH}" STREQUAL "arm64-v8a")
-        SET(ASM_OPTIONS "-x assembler-with-cpp")
-        SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS} -march=armv8+crypto -D__MUSL__")
-    ENDIF()
-ELSEIF(UNIX AND (NOT APPLE))
-    IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
-        SET(ASM_OPTIONS "-x assembler-with-cpp")
-        SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS} -march=armv8-a+crypto")
-    ENDIF()
-ENDIF()
-
-
-project(core)
-
-# Creates and names a library, sets it as either STATIC
-# or SHARED, and provides the relative paths to its source code.
-# You can define multiple libraries, and CMake builds them for you.
-# Gradle automatically packages shared libraries with your APK.
-
-add_library(core
-
-        # Sets the library as a shared library.
-        STATIC
-
-        # Provides a relative path to your source file(s).
-        MMKV.h
-        MMKV.cpp
-        MMKV_Android.cpp
-        MMKV_IO.h
-        MMKV_IO.cpp
-        MMKV_OSX.cpp
-        MMKVLog.h
-        MMKVLog.cpp
-        MMKVLog_Android.cpp
-        CodedInputData.h
-        CodedInputData.cpp
-        CodedInputData_OSX.cpp
-        CodedInputDataCrypt.h
-        CodedInputDataCrypt.cpp
-        CodedInputDataCrypt_OSX.cpp
-        CodedOutputData.h
-        CodedOutputData.cpp
-        KeyValueHolder.h
-        KeyValueHolder.cpp
-        PBUtility.h
-        PBUtility.cpp
-        MiniPBCoder.h
-        MiniPBCoder.cpp
-        MiniPBCoder_OSX.cpp
-        MMBuffer.h
-        MMBuffer.cpp
-        InterProcessLock.h
-        InterProcessLock.cpp
-        InterProcessLock_Win32.cpp
-        InterProcessLock_Android.cpp
-        MemoryFile.h
-        MemoryFile.cpp
-        MemoryFile_Android.cpp
-        MemoryFile_Linux.cpp
-        MemoryFile_Win32.cpp
-        MemoryFile_OSX.cpp
-        ThreadLock.h
-        ThreadLock.cpp
-        ThreadLock_Win32.cpp
-        MMKVMetaInfo.hpp
-        aes/AESCrypt.h
-        aes/AESCrypt.cpp
-        aes/openssl/openssl_aes.h
-        aes/openssl/openssl_aes_core.cpp
-        aes/openssl/openssl_aes_locl.h
-        aes/openssl/openssl_cfb128.cpp
-        aes/openssl/openssl_opensslconf.h
-        aes/openssl/openssl_md5_dgst.cpp
-        aes/openssl/openssl_md5_locl.h
-        aes/openssl/openssl_md5_one.cpp
-        aes/openssl/openssl_md5.h
-        aes/openssl/openssl_md32_common.h
-        aes/openssl/openssl_arm_arch.h
-        crc32/Checksum.h
-        crc32/crc32_armv8.cpp
-        crc32/zlib/zconf.h
-        crc32/zlib/zutil.h
-        crc32/zlib/crc32.h
-        crc32/zlib/crc32.cpp
-        MMKVPredef.h
-        )
-
-IF (MSVC OR (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"))
-    # .S files is not supported by MSVC.
-    # x86_64 asm not supported in OHOS
-ELSE()
-    target_sources(core PRIVATE
-        aes/openssl/openssl_aesv8-armx.S
-        aes/openssl/openssl_aes-armv4.S)
-ENDIF()
-
-target_include_directories(core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-IF (WIN32)
-    # MMKV can be used only with Unicode on Windows.
-    target_compile_definitions(core PUBLIC UNICODE)
-    target_compile_definitions(core PUBLIC _UNICODE)
-ENDIF()
-
-set_target_properties(core PROPERTIES
-        CXX_STANDARD 20
-        CXX_EXTENSIONS OFF
-        POSITION_INDEPENDENT_CODE ON
-        )
-
-find_library(zlib
-        z
-        )
-
-IF (NOT zlib)
-    target_compile_definitions(core PUBLIC MMKV_EMBED_ZLIB=1)
-ELSE()
-    target_link_libraries(core ${zlib})
-ENDIF()
-