Skip to content

Commit d67e433

Browse files
authored
fix: remove modular headears workaround (#183)
1 parent 4771cfd commit d67e433

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,10 @@ jobs:
187187
echo "turbo_cache_hit=1" >> $GITHUB_ENV
188188
fi
189189
190-
- name: Install cocoapods
190+
- name: Install cocoapods and plugins
191191
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
192192
run: |
193+
gem install cocoapods-swift-modular-headers
193194
cd apps/example
194195
pod install --project-directory=ios
195196
env:
@@ -230,9 +231,10 @@ jobs:
230231
echo "turbo_cache_hit=1" >> $GITHUB_ENV
231232
fi
232233
233-
- name: Install cocoapods
234+
- name: Install cocoapods and plugins
234235
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
235236
run: |
237+
gem install cocoapods-swift-modular-headers
236238
cd apps/example
237239
pod install --project-directory=ios
238240
env:
@@ -277,9 +279,10 @@ jobs:
277279
echo "turbo_cache_hit=1" >> $GITHUB_ENV
278280
fi
279281
280-
- name: Install cocoapods
282+
- name: Install cocoapods and plugins
281283
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
282284
run: |
285+
gem install cocoapods-swift-modular-headers
283286
cd apps/example
284287
pod install --project-directory=macos
285288
env:

apps/example/ios/Podfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
plugin 'cocoapods-swift-modular-headers'
2+
13
ws_dir = Pathname.new(__dir__)
24
ws_dir = ws_dir.parent until
35
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"
68

79
workspace 'ReactNativeBottomTabsExample.xcworkspace'
810

9-
use_test_app! do |test_app|
10-
# Workaround for not using use_frameworks! in the Podfile
11-
pod 'SDWebImage', :modular_headers => true
12-
pod 'SDWebImageSVGCoder', :modular_headers => true
13-
end
11+
apply_modular_headers_for_swift_dependencies()
1412

13+
use_test_app!

apps/example/macos/Podfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
plugin 'cocoapods-swift-modular-headers'
2+
13
ws_dir = Pathname.new(__dir__)
24
ws_dir = ws_dir.parent until
35
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"
68

79
workspace 'ReactNativeBottomTabs.xcworkspace'
810

9-
use_test_app! do |test_app|
10-
# Workaround for not using use_frameworks! in the Podfile
11-
pod 'SDWebImage', :modular_headers => true
12-
pod 'SDWebImageSVGCoder', :modular_headers => true
13-
end
11+
apply_modular_headers_for_swift_dependencies()
12+
13+
use_test_app!

0 commit comments

Comments
 (0)