Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ Pod::Spec.new do |s|
"HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
}

if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = 'FBReactNativeSpec'
s.module_name = 'React_RCTFBReactNativeSpec'
end
resolve_use_frameworks(s, header_mappings_dir: 'FBReactNativeSpec', module_name: "React_RCTFBReactNativeSpec")

s.dependency "React-jsi"
s.dependency "RCTRequired"
Expand Down
4 changes: 1 addition & 3 deletions packages/react-native/React/Runtime/React-RCTRuntime.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ Pod::Spec.new do |s|
s.header_dir = header_dir
s.module_name = module_name

if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = "./"
end
resolve_use_frameworks(s, header_mappings_dir: "./")

s.pod_target_xcconfig = {
"OTHER_CFLAGS" => "$(inherited) " + new_arch_flags,
Expand Down
5 changes: 1 addition & 4 deletions packages/react-native/ReactCommon/React-Fabric.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.header_mappings_dir = './'
s.module_name = 'React_Fabric'
end
resolve_use_frameworks(s, header_mappings_dir: "./", module_name: "React_Fabric")

s.dependency "React-jsiexecutor"
s.dependency "RCTRequired"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@ Pod::Spec.new do |s|
"HEADER_SEARCH_PATHS" => header_search_path.join(" "),
}

if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = './'
s.module_name = 'React_FabricComponents'
end
resolve_use_frameworks(s, header_mappings_dir: "./", module_name: "React_FabricComponents")

s.dependency "React-jsiexecutor"
s.dependency "RCTRequired"
Expand Down
5 changes: 1 addition & 4 deletions packages/react-native/ReactCommon/React-FabricImage.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ Pod::Spec.new do |s|
"HEADER_SEARCH_PATHS" => header_search_path.join(" ")
}

if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = './'
s.module_name = 'React_FabricImage'
end
resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_FabricImage")

s.dependency "React-jsiexecutor", version
s.dependency "RCTRequired", version
Expand Down
5 changes: 1 addition & 4 deletions packages/react-native/ReactCommon/React-Mapbuffer.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ Pod::Spec.new do |s|
s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => ["\"$(PODS_TARGET_SRCROOT)\""], "USE_HEADERMAP" => "YES",
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }

if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = './'
s.module_name = 'React_Mapbuffer'
end
resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_Mapbuffer")

add_dependency(s, "React-debug")
add_rn_third_party_dependencies(s)
Expand Down
5 changes: 2 additions & 3 deletions packages/react-native/ReactCommon/ReactCommon.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ Pod::Spec.new do |s|
"DEFINES_MODULE" => "YES",
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"GCC_WARN_PEDANTIC" => "YES" }
if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.header_mappings_dir = './'
end

resolve_use_frameworks(s, header_mappings_dir: './')

add_rn_third_party_dependencies(s)
add_rncore_dependency(s)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"GCC_WARN_PEDANTIC" => "YES" }

if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = './'
s.module_name = 'React_jsitracing'
end
resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_jsitracing")

s.dependency "React-jsi"
end
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ Pod::Spec.new do |s|
"USE_HEADERMAP" => "YES",
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
}
if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.header_mappings_dir = '../'
s.module_name = 'React_jserrorhandler'
end

resolve_use_frameworks(s, header_mappings_dir: '../', module_name: "React_jserrorhandler")

s.dependency "React-jsi"
s.dependency "React-cxxreact"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ Pod::Spec.new do |s|
"PUBLIC_HEADERS_FOLDER_PATH" => "#{module_name}.framework/Headers/#{header_dir}"
} : {})

if ENV['USE_FRAMEWORKS']
s.module_name = module_name
end
resolve_use_frameworks(s, module_name: module_name)

add_dependency(s, "React-oscompat") # Needed for USE_FRAMEWORKS=dynamic
s.dependency "React-featureflags"
add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
s.dependency "React-jsi"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"DEFINES_MODULE" => "YES"}

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = module_name
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: module_name)

add_rn_third_party_dependencies(s)
add_rncore_dependency(s)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"DEFINES_MODULE" => "YES"}

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = module_name
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: module_name)

add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
add_dependency(s, "React-featureflags")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"DEFINES_MODULE" => "YES"}

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = module_name
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: module_name)

s.dependency "React-oscompat"
s.dependency "React-timing"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ Pod::Spec.new do |s|
s.source_files = podspec_sources("react/runtime/*.{cpp,h}", "react/runtime/*.h")
s.header_dir = "react/runtime"

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = "JSITooling"
s.header_mappings_dir = "./"
end
resolve_use_frameworks(s, header_mappings_dir: "./", module_name: "JSITooling")

s.pod_target_xcconfig = {
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,5 @@ Pod::Spec.new do |s|
s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = "React_debug"
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_debug")
end
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ Pod::Spec.new do |s|
"HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = "React_featureflags"
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_featureflags")

add_rn_third_party_dependencies(s)
add_rncore_dependency(s)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ Pod::Spec.new do |s|
"USE_HEADERMAP" => "YES",
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"GCC_WARN_PEDANTIC" => "YES" }
if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.header_mappings_dir = './'
end

resolve_use_frameworks(s, header_mappings_dir: './')

s.source_files = podspec_sources("ReactCommon/**/*.{mm,cpp,h}", "ReactCommon/**/*.{h}")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ Pod::Spec.new do |s|
"OTHER_CFLAGS" => "$(inherited)",
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS']
s.module_name = "React_defaultsnativemodule"
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_defaultsnativemodule")

s.dependency "React-jsi"
s.dependency "React-jsiexecutor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ Pod::Spec.new do |s|
"OTHER_CFLAGS" => "$(inherited)",
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS']
s.module_name = "React_domnativemodule"
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_domnativemodule")

s.dependency "React-jsi"
s.dependency "React-jsiexecutor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ Pod::Spec.new do |s|
"OTHER_CFLAGS" => "$(inherited)",
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS']
s.module_name = "React_featureflagsnativemodule"
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_featureflagsnativemodule")

s.dependency "React-jsi"
s.dependency "React-jsiexecutor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ Pod::Spec.new do |s|
"OTHER_CFLAGS" => "$(inherited)",
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS']
s.module_name = "idlecallbacksnativemodule"
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "idlecallbacksnativemodule")

s.dependency "React-jsi"
s.dependency "React-jsiexecutor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ Pod::Spec.new do |s|
"HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS']
s.module_name = "React_microtasksnativemodule"
s.header_mappings_dir = "../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_microtasksnativemodule")

s.dependency "React-jsi"
s.dependency "React-jsiexecutor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ Pod::Spec.new do |s|
s.framework = "UIKit"

if ENV['USE_FRAMEWORKS']
# Do not use resolve_use_frameworks here - since we're including source files.
# Then it is not needed.
s.header_mappings_dir = './'
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"HEADER_SEARCH_PATHS" => header_search_paths.join(' ')}

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = "React_performancecdpmetrics"
s.header_mappings_dir = "../../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../../..", module_name: "React_performancecdpmetrics")

add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
s.dependency "React-jsi"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"HEADER_SEARCH_PATHS" => header_search_paths.join(' ')}

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = "React_performancetimeline"
s.header_mappings_dir = "../../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../../..", module_name: "React_performancetimeline")

s.dependency "React-featureflags"
add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"HEADER_SEARCH_PATHS" => header_search_paths.join(' ')}

if ENV['USE_FRAMEWORKS']
s.module_name = "React_rendererconsistency"
s.header_mappings_dir = "../../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../../..", module_name: "React_rendererconsistency")

end
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ end

header_search_paths = []

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
if ENV['USE_FRAMEWORKS']
header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the renderer/css access its own files
end

Expand All @@ -40,10 +40,7 @@ Pod::Spec.new do |s|
"DEFINES_MODULE" => "YES",
}

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = "React_renderercss"
s.header_mappings_dir = "../../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../../..", module_name: "React_renderercss")

add_dependency(s, "React-debug")
add_dependency(s, "React-utils")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ Pod::Spec.new do |s|
"DEFINES_MODULE" => "YES"
}

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = "React_rendererdebug"
s.header_mappings_dir = "../../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../../..", module_name: "React_rendererdebug")

add_dependency(s, "React-debug")
add_rn_third_party_dependencies(s)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ Pod::Spec.new do |s|
s.header_dir = "react/renderer/graphics"
s.framework = "UIKit"

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = "React_graphics"
s.header_mappings_dir = "../../.."
if ENV['USE_FRAMEWORKS']
header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""]
end

resolve_use_frameworks(s, header_mappings_dir: "../../..", module_name: "React_graphics")

s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"HEADER_SEARCH_PATHS" => header_search_paths.join(" "),
"DEFINES_MODULE" => "YES",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@ Pod::Spec.new do |s|
s.source_files = podspec_sources(source_files, "**/*.h")
s.header_dir = "react/renderer/imagemanager"

if ENV['USE_FRAMEWORKS']
s.module_name = "React_ImageManager"
s.header_mappings_dir = "./"
end
resolve_use_frameworks(s, header_mappings_dir: "./", module_name: "React_ImageManager")

s.pod_target_xcconfig = {
"USE_HEADERMAP" => "NO",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"HEADER_SEARCH_PATHS" => header_search_paths.join(' ')}

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.module_name = "React_runtimescheduler"
s.header_mappings_dir = "../../.."
end
resolve_use_frameworks(s, header_mappings_dir: "../../..", module_name: "React_runtimescheduler")

add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
s.dependency "React-callinvoker"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"GCC_WARN_PEDANTIC" => "YES" }

if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
s.header_mappings_dir = '../../'
s.module_name = 'React_RuntimeCore'
end
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_RuntimeCore")

s.dependency "React-jsiexecutor"
s.dependency "React-cxxreact"
Expand Down
Loading
Loading