feat: enable new_arch build

rnmapbox · Sep 21, 2023 · 3dfd692 · 3dfd692
1 parent b7521ed
commit 3dfd692
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 5 deletions.
diff --git a/.github/workflows/android-actions.yml b/.github/workflows/android-actions.yml
@@ -11,6 +11,11 @@ on:
         default: mapbox
         required: false
         type: string
+      NEW_ARCH:
+        description: "If build with new architecture or not"
+        default: false
+        required: false
+        type: boolean
     secrets:
       MAPBOX_ACCESS_TOKEN:
         required: true
@@ -54,3 +59,4 @@ jobs:
         working-directory: example/android
         env:
           CI_MAP_IMPL: ${{ inputs.MAP_IMPL }}
+          ORG_GRADLE_PROJECT_newArchEnabled: ${{ inputs.NEW_ARCH && 'true' || 'false' }}
diff --git a/.github/workflows/ios-actions.yml b/.github/workflows/ios-actions.yml
@@ -11,6 +11,11 @@ on:
         default: mapbox
         required: false
         type: string
+      NEW_ARCH:
+        description: "If build with new architecture or not"
+        default: false
+        required: false
+        type: boolean
     secrets:
       MAPBOX_ACCESS_TOKEN:
         required: true
@@ -73,6 +78,8 @@ jobs:
         run: cd ios && pod --version && pod update MapboxMaps && pod install
         env:
           CI_MAP_IMPL: ${{ inputs.MAP_IMPL }}
+          RCT_NEW_ARCH_ENABLED: ${{ inputs.NEW_ARCH && 1 || 0 }}
+          NO_FLIPPER: 1
 
       - name: Install Detox Dependencies
         run: |

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
@@ -77,6 +77,20 @@ jobs:
       MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
       MAPBOX_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_DOWNLOAD_TOKEN }}
 
+  call_android_workflow_fabric:
+    name: "Android/Mapbox/Fabric"
+    needs: [lint_test_generate,has_mapbox_token]
+    uses: ./.github/workflows/android-actions.yml
+    with:
+      NVMRC: ${{ needs.lint_test_generate.outputs.NVMRC }}
+      MAP_IMPL: mapbox
+      NEW_ARCH: true
+    if: needs.has_mapbox_token.outputs.has-mapbox-token == 'true'
+    secrets:
+      MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
+      MAPBOX_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_DOWNLOAD_TOKEN }}
+
+
   call_android_workflow_11:
     name: "Android/Mapbox11"
     needs: [lint_test_generate,has_mapbox_token]
@@ -101,6 +115,19 @@ jobs:
       MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
       MAPBOX_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_DOWNLOAD_TOKEN }}
 
+  call_ios_workflow_fabric:
+    name: "iOS/Mapbox/Fabric"
+    needs: [lint_test_generate,has_mapbox_token]
+    uses: ./.github/workflows/ios-actions.yml
+    if: needs.has_mapbox_token.outputs.has-mapbox-token == 'true'
+    with:
+      NVMRC: ${{ needs.lint_test_generate.outputs.NVMRC }}
+      MAP_IMPL: mapbox
+      NEW_ARCH: true
+    secrets:
+      MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
+      MAPBOX_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_DOWNLOAD_TOKEN }}
+
   call_ios_workflow_11:
     name: "iOS/Mapbox11"
     needs: [lint_test_generate,has_mapbox_token]

diff --git a/example/ios/.byebug_history b/example/ios/.byebug_history
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -4,6 +4,7 @@ require Pod::Executable.execute_command('node', ['-p',
     "react-native/scripts/react_native_pods.rb",
     {paths: [process.argv[1]]},
   )', __dir__]).strip
+prepare_react_native_project!
 
 $RNMapboxMapsImpl = 'mapbox'
 if ENV['RNMBX11']
@@ -50,6 +51,10 @@ if linkage != nil
   use_frameworks! :linkage => linkage.to_sym
 end
 
+
+flags = get_default_flags()
+use_modular_headers! if flags[:fabric_enabled]
+
 production = ENV["PRODUCTION"] == "1"
 
 # We ignore warning except for RNMapboxMaps

diff --git a/example/react-native.config.js b/example/react-native.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  dependencies: {
+    '@rnmapbox/maps': {
+      root: '../',
+    },
+  },
+};