feat: Add support for RN 0.76 (#224)

* upgrade iOS to RN 0.76.1

* android upgrade to RN 0.76

* fix eslint setup

* android fix cmake

* fix CI node setup

* tests have changed due to updated babel version

* fix java version

* upgrade yest

* fix iOS builds

* change checksum of podfile for GH action to re-evaluate

* fix iOS builds

* fix: fix iOS podspec for new arch (#225)

* fix(ios): fix install problems on new arch

* compile example app for new arch

Author: hannojg

.eslintignore

@@ -0,0 +1,2 @@
+node_modules/
+lib/

.eslintrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+  root: true,
+  extends: ["@react-native", "prettier"],
+  plugins: ["prettier"],
+  rules: {
+    "prettier/prettier": [
+      "warn",
+      {
+        quoteProps: "consistent",
+        singleQuote: false,
+        tabWidth: 2,
+        trailingComma: "es5",
+        useTabs: false,
+      },
+    ],
+  },
+};

.github/actions/setup/action.yml

@@ -6,8 +6,6 @@ runs:
   steps:
     - name: Setup Node.js
       uses: actions/setup-node@v3
-      with:
-        node-version-file: .nvmrc
 
     - name: Cache dependencies
       id: yarn-cache

.github/workflows/build-android.yml

@@ -5,20 +5,20 @@ on:
     branches:
       - main
     paths:
-      - '.github/workflows/build-android.yml'
-      - 'android/**'
-      - 'cpp/**'
-      - 'example/android/**'
-      - 'yarn.lock'
-      - 'example/yarn.lock'
+      - ".github/workflows/build-android.yml"
+      - "android/**"
+      - "cpp/**"
+      - "example/android/**"
+      - "yarn.lock"
+      - "example/yarn.lock"
   pull_request:
     paths:
-      - '.github/workflows/build-android.yml'
-      - 'android/**'
-      - 'cpp/**'
-      - 'example/android/**'
-      - 'yarn.lock'
-      - 'example/yarn.lock'
+      - ".github/workflows/build-android.yml"
+      - "android/**"
+      - "cpp/**"
+      - "example/android/**"
+      - "yarn.lock"
+      - "example/yarn.lock"
 
 jobs:
   build_example:
@@ -27,10 +27,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.github/workflows/build-ios.yml

@@ -5,18 +5,18 @@ on:
     branches:
       - main
     paths:
-      - '.github/workflows/build-ios.yml'
-      - 'ios/**'
-      - 'cpp/**'
-      - '*.podspec'
-      - 'example/ios/**'
+      - ".github/workflows/build-ios.yml"
+      - "ios/**"
+      - "cpp/**"
+      - "*.podspec"
+      - "example/ios/**"
   pull_request:
     paths:
-      - '.github/workflows/build-ios.yml'
-      - 'ios/**'
-      - 'cpp/**'
-      - '*.podspec'
-      - 'example/ios/**'
+      - ".github/workflows/build-ios.yml"
+      - "ios/**"
+      - "cpp/**"
+      - "*.podspec"
+      - "example/ios/**"
 
 jobs:
   build:
@@ -51,7 +51,7 @@ jobs:
       - name: Setup Ruby (bundle)
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7.6'
+          ruby-version: "2.7.6"
           bundler-cache: true
           working-directory: example
 
@@ -63,10 +63,8 @@ jobs:
             ~/Library/Caches/CocoaPods
             ~/.cocoapods
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
       - name: Install Pods
-        run: bundle exec pod check || bundle exec pod install
+        run: RCT_NEW_ARCH_ENABLED=1 bundle exec pod install
       - name: Install xcpretty
         run: gem install xcpretty
       - name: Build App

.gitignore

@@ -43,6 +43,7 @@ android.iml
 # Cocoapods
 #
 example/ios/Pods
+example/ios/.xcode.env.local
 
 # Ruby
 example/vendor/

.nvmrc

@@ -0,0 +1,7 @@
+{
+  "quoteProps": "consistent",
+  "singleQuote": false,
+  "tabWidth": 2,
+  "trailingComma": "es5",
+  "useTabs": false
+}

.prettierrc

@@ -19,10 +19,6 @@ add_compile_options(${folly_FLAGS})
 find_package(fbjni REQUIRED CONFIG)
 find_package(ReactAndroid REQUIRED CONFIG)
 
-if(${JS_RUNTIME} STREQUAL "hermes")
-  find_package(hermes-engine REQUIRED CONFIG)
-endif()
-
 file(GLOB_RECURSE SOURCES_COMMON CONFIGURE_DEPENDS "../cpp/**.cpp")
 
 add_library(
@@ -59,38 +55,62 @@ target_link_libraries(
 
 target_link_libraries(
   ${PACKAGE_NAME}
-  ReactAndroid::folly_runtime
-  ReactAndroid::glog
   ReactAndroid::jsi
-  ReactAndroid::reactnativejni
   fbjni::fbjni
 )
 
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    ReactAndroid::reactnative             # <-- RN: Native Modules umbrella prefab
+  )
+else()
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    ReactAndroid::reactnativejni           # <-- RN: React Native JNI bindings
+    ReactAndroid::folly_runtime
+    ReactAndroid::glog
+  )
+endif()
+
+# Add the appropriate JS runtime
 if(${JS_RUNTIME} STREQUAL "hermes")
-  string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_HERMES=1")
+  find_package(hermes-engine REQUIRED CONFIG)
 
-  # From prefab from module `com.facebook.react:hermes-android`
-  set(HERMES_LIB hermes-engine::libhermes)
+  string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_HERMES=1")
 
   target_link_libraries(
     ${PACKAGE_NAME}
-    ${HERMES_LIB}
+    hermes-engine::libhermes
   )
 
   if(${HERMES_ENABLE_DEBUGGER})
-    set(HERMES_EXECUTOR_LIB ReactAndroid::hermes_executor)
+    if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+      target_link_libraries(
+        ${PACKAGE_NAME}
+        ReactAndroid::hermestooling
+      )
+    else()
+      target_link_libraries(
+        ${PACKAGE_NAME}
+        ReactAndroid::hermes_executor
+      )
+    endif()
+  endif()
+elseif(${JS_RUNTIME} STREQUAL "jsc")
+  string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_JSC=1")
 
+  if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
     target_link_libraries(
       ${PACKAGE_NAME}
-      ${HERMES_EXECUTOR_LIB}
+      ReactAndroid::jsctooling
+    )
+  else()
+    target_link_libraries(
+      ${PACKAGE_NAME}
+      ReactAndroid::jscexecutor
     )
   endif()
-elseif(${JS_RUNTIME} STREQUAL "jsc")
-  string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_JSC=1")
-
-  set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
-
-  target_link_libraries(${PACKAGE_NAME} ${JSEXECUTOR_LIB})
 else()
   message(FATAL_ERROR "Unknown JS runtime ${JS_RUNTIME}.")
 endif()

android/CMakeLists.txt

@@ -145,6 +145,7 @@ android {
       "**/libhermes.so",
       "**/libhermes-executor-debug.so",
       "**/libhermes_executor.so",
+      "**/libreactnative.so",
       "**/libreactnativejni.so",
       "**/libturbomodulejsijni.so",
       "**/libreact_nativemodule_core.so",