Skip to content

fix: remove modular headers workaround #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 8, 2024
Merged

fix: remove modular headers workaround #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
9 changes: 4 additions & 5 deletions apps/example/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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") ||
Expand All @@ -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!
10 changes: 5 additions & 5 deletions apps/example/macos/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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") ||
Expand All @@ -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!
Loading