Skip to content
Merged
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
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ source 'https://rubygems.org' do
gem 'minitest'
gem 'rubocop', require: false
gem 'rubocop-minitest'
gem 'xcodeproj'
end
16 changes: 15 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ GEM
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.4)
rexml
ast (2.4.2)
atomos (0.1.3)
claide (1.0.3)
colored2 (3.1.2)
minitest (5.14.4)
nanaimo (0.3.0)
parallel (1.20.1)
parser (3.0.2.0)
ast (~> 2.4.1)
Expand All @@ -27,6 +33,13 @@ GEM
rubocop (>= 0.90, < 2.0)
ruby-progressbar (1.11.0)
unicode-display_width (2.0.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)

PLATFORMS
ruby
Expand All @@ -35,6 +48,7 @@ DEPENDENCIES
minitest!
rubocop!
rubocop-minitest!
xcodeproj!

BUNDLED WITH
2.2.15
2.2.22
56 changes: 32 additions & 24 deletions ios/test_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,32 +41,21 @@ def autolink_script_version
package_version(resolve_module('@react-native-community/cli-platform-ios'))
end

def platform_config(project_root, target_platform)
def platform_config(key, project_root, target_platform)
manifest = app_manifest(project_root)
return if manifest.nil?

config = manifest[target_platform.to_s]
return config if !config.nil? && !config.empty?
return config[key] if !config.nil? && !config.empty?
end

def bundle_identifier(project_root, target_platform)
config = platform_config(project_root, target_platform)
return if config.nil?

bundle_identifier = config['bundleIdentifier']
bundle_identifier = platform_config('bundleIdentifier', project_root, target_platform)
return bundle_identifier if bundle_identifier.is_a? String

@test_app_bundle_identifier
end

def react_native_from_manifest(project_root, target_platform)
config = platform_config(project_root, target_platform)
return if config.nil?

react_native_path = config['reactNativePath']
return react_native_path if react_native_path.is_a? String
end

def find_project_root
podfile_path = Thread.current.backtrace_locations.find do |location|
File.basename(location.absolute_path) == 'Podfile'
Expand Down Expand Up @@ -101,8 +90,8 @@ def project_path(file, target_platform)
end

def react_native_path(project_root, target_platform)
react_native_path = react_native_from_manifest(project_root, target_platform)
return Pathname.new(resolve_module(react_native_path)) unless react_native_path.nil?
react_native_path = platform_config('reactNativePath', project_root, target_platform)
return Pathname.new(resolve_module(react_native_path)) if react_native_path.is_a? String

react_native = case target_platform
when :ios then 'react-native'
Expand Down Expand Up @@ -245,8 +234,33 @@ def make_project!(xcodeproj, project_root, target_platform)
version = version[0] * 10_000 + version[1] * 100 + version[2]
version_macro = "REACT_NATIVE_VERSION=#{version}"

build_settings = {}

code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform)
if code_sign_entitlements.is_a? String
package_root = File.dirname(find_file('app.json', project_root))
entitlements = Pathname.new(File.join(package_root, code_sign_entitlements))
build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements.relative_path_from(destination).to_s
end

code_sign_identity = platform_config('codeSignIdentity', project_root, target_platform)
build_settings['CODE_SIGN_IDENTITY'] = code_sign_identity if code_sign_identity.is_a? String

development_team = platform_config('developmentTeam', project_root, target_platform)
build_settings['DEVELOPMENT_TEAM'] = development_team if development_team.is_a? String

product_bundle_identifier = bundle_identifier(project_root, target_platform)
if product_bundle_identifier.is_a? String
build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
end

product_name = display_name || name
build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
product_name
else
target.name
end

supports_flipper = target_platform == :ios && flipper_enabled?(version)

app_project = Xcodeproj::Project.open(dst_xcodeproj)
Expand All @@ -263,16 +277,10 @@ def make_project!(xcodeproj, project_root, target_platform)
"USE_FLIPPER=#{use_flipper ? 1 : 0}",
]

if product_bundle_identifier.is_a? String
config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
build_settings.each do |setting, value|
config.build_settings[setting] = value
end

config.build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
product_name
else
target.name
end

next unless use_flipper

config.build_settings['OTHER_SWIFT_FLAGS'] ||= [
Expand Down
5 changes: 2 additions & 3 deletions macos/ReactTestApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -379,10 +379,9 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = UBF8T346G9;
INFOPLIST_FILE = ReactTestApp/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -401,7 +400,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = ReactTestApp/Info.plist;
Expand Down
4 changes: 0 additions & 4 deletions macos/ReactTestApp/ReactTestApp.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,5 @@
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
</array>
</dict>
</plist>
10 changes: 8 additions & 2 deletions test/__fixtures__/with_platform_resources/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@
},
"ios": {
"bundleIdentifier": "com.react.ReactTestApp-ios",
"reactNativePath": "react-native-ios"
"codeSignEntitlements": "codeSignEntitlements-ios",
"codeSignIdentity": "codeSignIdentity-ios",
"developmentTeam": "developmentTeam-ios",
"reactNativePath": "reactNativePath-ios"
},
"macos": {
"bundleIdentifier": "com.react.ReactTestApp-macos",
"reactNativePath": "react-native-macos"
"codeSignEntitlements": "codeSignEntitlements-macos",
"codeSignIdentity": "codeSignIdentity-macos",
"developmentTeam": "developmentTeam-macos",
"reactNativePath": "reactNativePath-macos"
}
}
27 changes: 22 additions & 5 deletions test/test_test_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,13 @@ def test_react_native_pods
assert_nil(bundle_identifier(fixture_path('without_resources'), target))
end

define_method("test_#{target}_react_native_path") do
assert_equal("react-native-#{target}",
react_native_from_manifest(fixture_path('with_platform_resources'), target))
assert_nil(react_native_from_manifest(fixture_path('without_platform_resources'), target))
assert_nil(react_native_from_manifest(fixture_path('without_resources'), target))
define_method("test_#{target}_project_settings") do
%w[codeSignEntitlements codeSignIdentity developmentTeam reactNativePath].each do |setting|
assert_equal("#{setting}-#{target}",
platform_config(setting, fixture_path('with_platform_resources'), target))
assert_nil(platform_config(setting, fixture_path('without_platform_resources'), target))
assert_nil(platform_config(setting, fixture_path('without_resources'), target))
end
end

define_method("test_#{target}_resources_pod_returns_spec_path") do
Expand Down Expand Up @@ -188,4 +190,19 @@ def test_react_native_pods
GC.enable
end
end

def test_macos_project_cannot_set_development_team
# Xcode expects the development team used for code signing to exist when
# targeting macOS. Unlike when targeting iOS, the warnings are treated as
# errors.
require 'xcodeproj'

project = Xcodeproj::Project.open('macos/ReactTestApp.xcodeproj')
test_app = project.targets.detect { |target| target.name == 'ReactTestApp' }
assert(test_app)
test_app.build_configurations.each do |config|
assert_equal('-', config.build_settings['CODE_SIGN_IDENTITY'])
assert_nil(config.build_settings['DEVELOPMENT_TEAM'])
end
end
end