feat: Migrate to React Native 0.71

.github/workflows/build-android.yml

@@ -27,10 +27,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup JDK 1.8
+      - name: Setup JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -57,7 +57,5 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Run Gradle Build for android/
-        run: cd android && ./gradlew assembleDebug --build-cache && cd ..
       - name: Run Gradle Build for example/android/
         run: cd example/android && ./gradlew assembleDebug --build-cache && cd ../..

.github/workflows/validate-android.yml

@@ -22,13 +22,13 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./android
+        working-directory: ./example/android
     steps:
       - uses: actions/checkout@v2
-      - name: Setup JDK 1.8
+      - name: Setup JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -42,9 +42,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
       - name: Install node_modules
-        run: yarn install --frozen-lockfile --cwd ..
+        run: yarn install --frozen-lockfile --cwd ../..
       - name: Install node_modules for example/
-        run: yarn install --frozen-lockfile --cwd ../example
+        run: yarn install --frozen-lockfile --cwd ..
 
       - name: Restore Gradle cache
         uses: actions/cache@v2

android/CMakeLists.txt

@@ -1,71 +1,41 @@
+project(ReactNativeMMKV)
 cmake_minimum_required(VERSION 3.9.0)
 
 set (PACKAGE_NAME "react-native-mmkv")
 set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_CXX_STANDARD 17)
 
-add_subdirectory(../MMKV/Core core)
-
+# Add headers search paths
 include_directories(
         ../MMKV/Core
         ../cpp
-        "${NODE_MODULES_DIR}/react-native/React"
-        "${NODE_MODULES_DIR}/react-native/React/Base"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
 )
 
-if(${REACT_NATIVE_VERSION} LESS 66)
-        file(
-                TO_CMAKE_PATH
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
-                INCLUDE_JSI_CPP
-        )
-endif()
-
+# Add MMKV core sources
+add_subdirectory(../MMKV/Core core)
+# Add react-native-mmkv sources
 add_library(reactnativemmkv  # <-- Library name
         SHARED
         src/main/cpp/cpp-adapter.cpp
         src/main/cpp/MmkvHostObject.cpp
         ../cpp/TypedArray.cpp
-        ${INCLUDE_JSI_CPP} # only on older RN versions
 )
-
+# Configure C++ 17
 set_target_properties(
         reactnativemmkv PROPERTIES
         CXX_STANDARD 17
         CXX_EXTENSIONS OFF
         POSITION_INDEPENDENT_CODE ON
 )
 
-file (GLOB LIBRN_DIR "${PREBUILT_DIR}/${ANDROID_ABI}")
-
-find_library(
-        log-lib
-        log
-)
-find_library(
-        REACT_NATIVE_JNI_LIB
-        reactnativejni
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-if(${REACT_NATIVE_VERSION} LESS 66)
-        # JSI lib didn't exist on RN 0.65 and before. Simply omit it.
-        set (JSI_LIB "")
-else()
-        # RN 0.66 distributes libjsi.so, can be used instead of compiling jsi.cpp manually.
-        find_library(
-                JSI_LIB
-                jsi
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
-        )
-endif()
+find_package(ReactAndroid REQUIRED CONFIG)
+find_library(log-lib log)
 
 target_link_libraries(
         reactnativemmkv
-        core
-        ${log-lib}
-        ${JSI_LIB}
-        ${REACT_NATIVE_JNI_LIB}
-        android
+        core                # <-- MMKV core
+        ${log-lib}          # <-- Logcat logger
+        ReactAndroid::jsi   # <-- JSI
+        android             # <-- Android JNI core
 )