From 3da0d5be6b9ec0835bba5a5941a05c86b8b8c60e Mon Sep 17 00:00:00 2001 From: Fabio Cipriani Date: Sun, 24 Aug 2025 14:38:15 +0200 Subject: [PATCH 1/5] Fixing FollyConvert.h import also covering the scenario when using use_frameworks is used in library user's Podfile --- ios/RNMBX/RNMBXModelsComponentView.mm | 2 +- ios/RNMBX/RNMBXViewportComponentView.mm | 2 +- ios/RNMBX/Utils/FollyImporter.h | 15 +++++++++++++++ rnmapbox-maps.podspec | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 ios/RNMBX/Utils/FollyImporter.h diff --git a/ios/RNMBX/RNMBXModelsComponentView.mm b/ios/RNMBX/RNMBXModelsComponentView.mm index fe94bc6474..6c353ed0e7 100644 --- a/ios/RNMBX/RNMBXModelsComponentView.mm +++ b/ios/RNMBX/RNMBXModelsComponentView.mm @@ -12,8 +12,8 @@ #import "rnmapbox_maps-Swift.pre.h" -#import "RCTFollyConvert.h" #import "RNMBXFabricPropConvert.h" +#import "FollyImporter.h" // TODO: use generated RNMBXModelsEventEmitter, but need 0.73+ for dynamic support diff --git a/ios/RNMBX/RNMBXViewportComponentView.mm b/ios/RNMBX/RNMBXViewportComponentView.mm index df6986ae56..64d681e3bb 100644 --- a/ios/RNMBX/RNMBXViewportComponentView.mm +++ b/ios/RNMBX/RNMBXViewportComponentView.mm @@ -12,7 +12,7 @@ #import "rnmapbox_maps-Swift.pre.h" -#import "RCTFollyConvert.h" +#import "FollyImporter.h" // TODO: use generated RNMBXViewportEventEmitter, but need 0.73+ for dynamic support diff --git a/ios/RNMBX/Utils/FollyImporter.h b/ios/RNMBX/Utils/FollyImporter.h new file mode 100644 index 0000000000..6a5d4c0381 --- /dev/null +++ b/ios/RNMBX/Utils/FollyImporter.h @@ -0,0 +1,15 @@ +#ifdef RCT_NEW_ARCH_ENABLED + +#if __has_include() + // static libs / header maps (no use_frameworks!) + #import +#elif __has_include("FollyConvert.h") + /// `use_frameworks! :linkage => :static` users will need to import FollyConvert this way + #import "FollyConvert.h" +#elif __has_include("RCTFollyConvert.h") + #import "RCTFollyConvert.h" +#else + #error "FollyConvert.h not found. Ensure React-utils & RCT-Folly pods are installed." +#endif + +#endif \ No newline at end of file diff --git a/rnmapbox-maps.podspec b/rnmapbox-maps.podspec index e80750e45c..ac2a6f5879 100644 --- a/rnmapbox-maps.podspec +++ b/rnmapbox-maps.podspec @@ -253,7 +253,7 @@ Pod::Spec.new do |s| case $RNMapboxMapsImpl when 'mapbox' sp.source_files = "ios/RNMBX/**/*.{h,m,mm,swift}" - sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h' + sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h', 'ios/RNMBX/Utils/FollyImporter.h' if new_arch_enabled sp.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } install_modules_dependencies(sp) From 91f1c235bcc96706cf8cd7307944a760ff2e2473 Mon Sep 17 00:00:00 2001 From: Fabio Cipriani Date: Sun, 24 Aug 2025 15:18:08 +0200 Subject: [PATCH 2/5] updating macos image in ios-actions yml configuration --- .github/workflows/ios-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios-actions.yml b/.github/workflows/ios-actions.yml index 2028303904..65215e838c 100644 --- a/.github/workflows/ios-actions.yml +++ b/.github/workflows/ios-actions.yml @@ -36,7 +36,7 @@ on: jobs: build: name: iOS Example Build ${{ inputs.NEW_ARCH && 'Fabric' || 'Paper' }} ${{ inputs.MAP_IMPL }} - runs-on: macos-13 + runs-on: macos-15 timeout-minutes: 55 environment: ${{ inputs.env_name }} From 4c372ac52257e9933161034b50fdc0196c395416 Mon Sep 17 00:00:00 2001 From: Fabio Cipriani Date: Mon, 25 Aug 2025 10:54:43 +0200 Subject: [PATCH 3/5] Moving PropertyChanges.swift file to ios/Utils folder --- ios/RNMBX/{Uitls => Utils}/PropertyChanges.swift | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ios/RNMBX/{Uitls => Utils}/PropertyChanges.swift (100%) diff --git a/ios/RNMBX/Uitls/PropertyChanges.swift b/ios/RNMBX/Utils/PropertyChanges.swift similarity index 100% rename from ios/RNMBX/Uitls/PropertyChanges.swift rename to ios/RNMBX/Utils/PropertyChanges.swift From 3a2db52bb0e4018124d3e5064c96ccf53f48cb40 Mon Sep 17 00:00:00 2001 From: whiteHatCip Date: Mon, 25 Aug 2025 10:49:42 +0200 Subject: [PATCH 4/5] Renaming FollyImporter.h filename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new filename will be RNMBXFollyConvert.h Co-Authored-By: Miklós Fazekas --- ios/RNMBX/RNMBXModelsComponentView.mm | 2 +- ios/RNMBX/RNMBXViewportComponentView.mm | 2 +- ios/RNMBX/Utils/{FollyImporter.h => RNMBXFollyConvert.h} | 0 rnmapbox-maps.podspec | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename ios/RNMBX/Utils/{FollyImporter.h => RNMBXFollyConvert.h} (100%) diff --git a/ios/RNMBX/RNMBXModelsComponentView.mm b/ios/RNMBX/RNMBXModelsComponentView.mm index 6c353ed0e7..9d562bc8e9 100644 --- a/ios/RNMBX/RNMBXModelsComponentView.mm +++ b/ios/RNMBX/RNMBXModelsComponentView.mm @@ -12,8 +12,8 @@ #import "rnmapbox_maps-Swift.pre.h" +#import "RNMBXFollyConvert.h" #import "RNMBXFabricPropConvert.h" -#import "FollyImporter.h" // TODO: use generated RNMBXModelsEventEmitter, but need 0.73+ for dynamic support diff --git a/ios/RNMBX/RNMBXViewportComponentView.mm b/ios/RNMBX/RNMBXViewportComponentView.mm index 64d681e3bb..5d3ff077d5 100644 --- a/ios/RNMBX/RNMBXViewportComponentView.mm +++ b/ios/RNMBX/RNMBXViewportComponentView.mm @@ -12,7 +12,7 @@ #import "rnmapbox_maps-Swift.pre.h" -#import "FollyImporter.h" +#import "RNMBXFollyConvert.h" // TODO: use generated RNMBXViewportEventEmitter, but need 0.73+ for dynamic support diff --git a/ios/RNMBX/Utils/FollyImporter.h b/ios/RNMBX/Utils/RNMBXFollyConvert.h similarity index 100% rename from ios/RNMBX/Utils/FollyImporter.h rename to ios/RNMBX/Utils/RNMBXFollyConvert.h diff --git a/rnmapbox-maps.podspec b/rnmapbox-maps.podspec index ac2a6f5879..ef66c97b66 100644 --- a/rnmapbox-maps.podspec +++ b/rnmapbox-maps.podspec @@ -253,7 +253,7 @@ Pod::Spec.new do |s| case $RNMapboxMapsImpl when 'mapbox' sp.source_files = "ios/RNMBX/**/*.{h,m,mm,swift}" - sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h', 'ios/RNMBX/Utils/FollyImporter.h' + sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h', 'ios/RNMBX/Utils/RNMBXFollyConvert.h' if new_arch_enabled sp.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } install_modules_dependencies(sp) From 02d41075ebd15c522a53244db98567d6c9c9ec43 Mon Sep 17 00:00:00 2001 From: whiteHatCip Date: Mon, 25 Aug 2025 11:01:28 +0200 Subject: [PATCH 5/5] Reverting changes in ios-actions.yml --- .github/workflows/ios-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios-actions.yml b/.github/workflows/ios-actions.yml index 65215e838c..2028303904 100644 --- a/.github/workflows/ios-actions.yml +++ b/.github/workflows/ios-actions.yml @@ -36,7 +36,7 @@ on: jobs: build: name: iOS Example Build ${{ inputs.NEW_ARCH && 'Fabric' || 'Paper' }} ${{ inputs.MAP_IMPL }} - runs-on: macos-15 + runs-on: macos-13 timeout-minutes: 55 environment: ${{ inputs.env_name }}