Skip to content

Fix swift delegate detection #8056

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix swift delegate detection #8056

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b718da
Fix swift delegate detection
dcoulter45 Jun 26, 2025
d360bc4
Update podspec
dcoulter45 Jun 26, 2025
7e8be83
missing file exists check
dcoulter45 Jun 26, 2025
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
23 changes: 15 additions & 8 deletions ReactNativeNavigation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
require 'json'
require 'find'

package = JSON.parse(File.read(File.join(__dir__, 'package.json')))

fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'

# Detect if this is a Swift project by looking for user AppDelegate.swift files
dependency_paths = ['/node_modules/', '/Pods/', '/build/', '/Build/', '/DerivedData/']
swift_project = Dir.glob('**/AppDelegate.swift')
.reject { |file| dependency_paths.any? { |path| file.include?(path) } }
.any?
start_dir = File.expand_path('../../', __dir__)
swift_delegate_path = nil
Find.find(start_dir) do |path|
if path =~ /AppDelegate\.swift$/
swift_delegate_path = path
break
end
end

swift_project = File.exist?(swift_delegate_path)

# Debug output
if swift_project
puts "ReactNativeNavigation: Swift AppDelegate detected - enabling Swift-compatible configuration"
else
else
puts "ReactNativeNavigation: Objective-C AppDelegate detected - using standard configuration"
end

Expand Down Expand Up @@ -43,19 +50,19 @@ Pod::Spec.new do |s|
end

folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DFOLLY_CFG_NO_COROUTINES=1'

# Base xcconfig settings
xcconfig_settings = {
'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
"CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
"OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
}

# Only add DEFINES_MODULE for Swift projects
if swift_project
xcconfig_settings["DEFINES_MODULE"] = "YES"
end

s.pod_target_xcconfig = xcconfig_settings

if fabric_enabled
Expand Down