fix: remove modular headears workaround (#183)

callstackincubator · Dec 8, 2024 · d67e433 · d67e433
1 parent 4771cfd
commit d67e433
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -187,9 +187,10 @@ jobs:
             echo "turbo_cache_hit=1" >> $GITHUB_ENV
           fi
 
-      - name: Install cocoapods
+      - name: Install cocoapods and plugins
         if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
         run: |
+          gem install cocoapods-swift-modular-headers
           cd apps/example
           pod install --project-directory=ios
         env:
@@ -230,9 +231,10 @@ jobs:
             echo "turbo_cache_hit=1" >> $GITHUB_ENV
           fi
 
-      - name: Install cocoapods
+      - name: Install cocoapods and plugins
         if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
         run: |
+          gem install cocoapods-swift-modular-headers
           cd apps/example
           pod install --project-directory=ios
         env:
@@ -277,9 +279,10 @@ jobs:
             echo "turbo_cache_hit=1" >> $GITHUB_ENV
           fi
 
-      - name: Install cocoapods
+      - name: Install cocoapods and plugins
         if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
         run: |
+          gem install cocoapods-swift-modular-headers
           cd apps/example
           pod install --project-directory=macos
         env:

diff --git a/apps/example/ios/Podfile b/apps/example/ios/Podfile
@@ -1,3 +1,5 @@
+plugin 'cocoapods-swift-modular-headers'
+
 ws_dir = Pathname.new(__dir__)
 ws_dir = ws_dir.parent until
   File.exist?("#{ws_dir}/node_modules/react-native-test-app/test_app.rb") ||
@@ -6,9 +8,6 @@ require "#{ws_dir}/node_modules/react-native-test-app/test_app.rb"
 
 workspace 'ReactNativeBottomTabsExample.xcworkspace'
 
-use_test_app! do |test_app|
-  # Workaround for not using use_frameworks! in the Podfile
-  pod 'SDWebImage', :modular_headers => true
-  pod 'SDWebImageSVGCoder', :modular_headers => true
-end
+apply_modular_headers_for_swift_dependencies()
 
+use_test_app!
diff --git a/apps/example/macos/Podfile b/apps/example/macos/Podfile
@@ -1,3 +1,5 @@
+plugin 'cocoapods-swift-modular-headers'
+
 ws_dir = Pathname.new(__dir__)
 ws_dir = ws_dir.parent until
   File.exist?("#{ws_dir}/node_modules/react-native-test-app/macos/test_app.rb") ||
@@ -6,8 +8,6 @@ require "#{ws_dir}/node_modules/react-native-test-app/macos/test_app.rb"
 
 workspace 'ReactNativeBottomTabs.xcworkspace'
 
-use_test_app! do |test_app|
-  # Workaround for not using use_frameworks! in the Podfile
-  pod 'SDWebImage', :modular_headers => true
-  pod 'SDWebImageSVGCoder', :modular_headers => true
-end
+apply_modular_headers_for_swift_dependencies()
+
+use_test_app!