Skip to content

chore: remove unused code in podspec #2241

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
Jul 12, 2024
Merged

chore: remove unused code in podspec #2241

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
60 changes: 9 additions & 51 deletions RNScreens.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,6 @@ new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
platform = new_arch_enabled ? "11.0" : "9.0"
source_files = new_arch_enabled ? 'ios/**/*.{h,m,mm,cpp}' : ["ios/**/*.{h,m,mm}", "cpp/**/*.{cpp,h}"]

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

# Helper class to avoid clashing with Cocoapods install_dependencies function
class RNScreensDependencyHelper
# Helper class to add the Common subspec
def self.add_common_subspec(s, new_arch_enabled)
unless new_arch_enabled
return
end

s.subspec "common" do |ss|
ss.source_files = ["common/cpp/**/*.{cpp,h}", "cpp/**/*.{cpp,h}"]
ss.header_dir = "rnscreens"
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" }
end
end

# Function to support older versions of React Native which do not provide the
# install_modules_dependencies function
def self.install_dependencies(s, new_arch_enabled)
if new_arch_enabled
s.pod_target_xcconfig = {
'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly"',
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
}

s.compiler_flags = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED'

s.dependency "React"
s.dependency "React-RCTFabric"
s.dependency "React-Codegen"
s.dependency "RCT-Folly"
s.dependency "RCTRequired"
s.dependency "RCTTypeSafety"
s.dependency "ReactCommon/turbomodule/core"

self.add_common_subspec(s, new_arch_enabled)
else
s.dependency "React-Core"
s.dependency "React-RCTImage"
end
end
end

Pod::Spec.new do |s|
s.name = "RNScreens"
s.version = package["version"]
Expand All @@ -66,12 +22,14 @@ Pod::Spec.new do |s|
s.project_header_files = "cpp/**/*.h" # Don't expose C++ headers publicly to allow importing framework into Swift files
s.requires_arc = true

if defined?(install_modules_dependencies()) != nil
install_modules_dependencies(s)
# Add missing dependencies, that were not included in install_modules_dependencies
s.dependency "React-RCTImage"
RNScreensDependencyHelper.add_common_subspec(s, new_arch_enabled)
else
RNScreensDependencyHelper.install_dependencies(s, new_arch_enabled)
install_modules_dependencies(s)
if new_arch_enabled
s.subspec "common" do |ss|
ss.source_files = ["common/cpp/**/*.{cpp,h}", "cpp/**/*.{cpp,h}"]
ss.header_dir = "rnscreens"
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" }
end
end

s.dependency "React-RCTImage"
end