Skip to content

[RNTester] Add CocoaPods based macOS target. #211

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 16 commits into from
Jan 28, 2020
Merged

[RNTester] Add CocoaPods based macOS target. #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
77c7048
[RNTester] Check-in pod install artefacts
alloy Dec 20, 2019
de04ff9
[RNTester] Add CameraRoll pod dependency back
alloy Dec 20, 2019
525ccd2
[RNTester] First pass at adding CocoaPods based macOS target
alloy Dec 20, 2019
e8e8aaf
[RNTester] Add notifications pod to macOS target
alloy Dec 20, 2019
ec692b9
[CocoaPods] Make RCTText pod build for macOS
alloy Dec 20, 2019
d1329db
[CocoaPods] make RCTLinking pod build for macOS
alloy Dec 20, 2019
dc0a970
[CocoaPods] Exclude more files from RCTText pod
alloy Dec 21, 2019
1d05a56
[CocoaPods] Make Core pod build for macOS
alloy Dec 21, 2019
ab45a68
[CocoaPods] Exclude turbomodule sample from macOS
alloy Dec 21, 2019
b2552fe
[RNTester] Update CocoaPods artefact
alloy Dec 21, 2019
6ceb780
[RNTester] Update macOS target to follow non-pods version
alloy Dec 21, 2019
c48ab74
[CocoaPods] Tag all macOS changes to ease updating
alloy Jan 6, 2020
2059d65
[RNTester] Remove development team references
alloy Jan 7, 2020
8ed791f
[RNTester] Import Xcode artefact
alloy Jan 7, 2020
e8fd4d8
[RNTester] Start Metro on launch of macOS product
alloy Jan 7, 2020
b26a060
[RCTRedBox] Fix -[RCTRedBoxWindow dismiss] on macOS
alloy Jan 7, 2020
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
2 changes: 1 addition & 1 deletion Libraries/ART/React-ART.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Pod::Spec.new do |s|
s.homepage = "http://facebook.github.io/react-native/"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "**/*.{h,m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
2 changes: 1 addition & 1 deletion Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Pod::Spec.new do |s|
s.documentation_url = "https://facebook.github.io/react-native/docs/actionsheetios"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{h,m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Blob/React-RCTBlob.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Pod::Spec.new do |s|
s.homepage = "http://facebook.github.io/react-native/"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{h,m,mm}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Image/React-RCTImage.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Pod::Spec.new do |s|
s.documentation_url = "https://facebook.github.io/react-native/docs/image"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{h,m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
5 changes: 4 additions & 1 deletion Libraries/LinkingIOS/React-RCTLinking.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ Pod::Spec.new do |s|
s.documentation_url = "https://facebook.github.io/react-native/docs/linking"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{h,m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
s.header_dir = "React"

s.dependency "React-Core", version

s.osx.exclude_files = "RCTLinkingManager.m"
s.osx.source_files = "macos/RCTLinkingManager.m"
end
2 changes: 1 addition & 1 deletion Libraries/NativeAnimation/React-RCTAnimation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Pod::Spec.new do |s|
s.homepage = "http://facebook.github.io/react-native/"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "{Drivers/*,Nodes/*,*}.{h,m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Network/React-RCTNetwork.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Pod::Spec.new do |s|
s.homepage = "http://facebook.github.io/react-native/"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{h,m,mm}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
2 changes: 1 addition & 1 deletion Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Pod::Spec.new do |s|
s.documentation_url = "https://facebook.github.io/react-native/docs/pushnotificationios"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{h,m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Settings/React-RCTSettings.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Pod::Spec.new do |s|
s.documentation_url = "https://facebook.github.io/react-native/docs/settings"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{h,m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
4 changes: 3 additions & 1 deletion Libraries/Text/React-RCTText.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ Pod::Spec.new do |s|
s.documentation_url = "https://facebook.github.io/react-native/docs/text"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "**/*.{h,m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
s.header_dir = "React"

s.dependency "React-Core", version

s.osx.exclude_files = "TextInput/RCTInputAccessory{,Shadow}View*.{h,m}"
end
2 changes: 1 addition & 1 deletion Libraries/Vibration/React-RCTVibration.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Pod::Spec.new do |s|
s.documentation_url = "https://facebook.github.io/react-native/docs/vibration"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{h,m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
2 changes: 1 addition & 1 deletion Libraries/WebSocket/React-RCTWebSocket.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Pod::Spec.new do |s|
s.documentation_url = "https://facebook.github.io/react-native/docs/network#websocket-support"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{h,m}",
"Libraries/fishhook/*.{h,c}"
Expand Down
2 changes: 1 addition & 1 deletion Libraries/fishhook/React-fishhook.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Pod::Spec.new do |s|
s.homepage = "http://facebook.github.io/react-native/"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "9.0", :tvos => "9.2" }
s.platforms = { :ios => "9.0", :tvos => "9.2", :osx => "10.14" } # TODO(macOS GH#214)
s.source = source
s.source_files = "*.{c,h}"
s.header_dir = "fishhook"
Expand Down
31 changes: 29 additions & 2 deletions RNTester/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,16 @@ end

source 'https://cdn.cocoapods.org/'

platform :ios, '9.0'

require_relative '../scripts/autolink-ios'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still seems wrong to pull in and use "autolink-ios" for both Mac and iOS, but given that we're trying to reduce diffs between us and facebook, it's probably not a blocking issue to get cleaned up right now. Ideally we'd have an autolink-apple, autolink-mac, and autolink-ios

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still seems wrong to pull in and use "autolink-ios" for both Mac and iOS, but given that we're trying to reduce diffs between us and facebook, it's probably not a blocking issue to get cleaned up right now. Ideally we'd have an autolink-apple, autolink-mac, and autolink-ios

Just in case this was missed before, this comment addresses the plan #211 (comment)


# TODO(macOS GH#214)
# Otherwise duplicate UUIDs are being generated between the iOS and macOS targets.
# FIXME: https://github.com/microsoft/react-native/issues/210
install! 'cocoapods', :deterministic_uuids => false

# TODO(macOS GH#214)
target 'RNTester' do
platform :ios, '9.0'
# Uncomment for Swift
# use_frameworks!

Expand All @@ -59,3 +64,25 @@ target 'RNTester' do
# To use fabric: add `fabric_enabled` option to the use_react_native method above, like below
# use_react_native!(path: "..", turbo_modules_enabled: true, fabric_enabled: true)
end

# TODO(macOS GH#214)
target 'RNTester-macOS' do
platform :osx, '10.14'
# Uncomment for Swift
# use_frameworks!

project 'RNTesterPods.xcodeproj'

# Enable TurboModule
use_react_native!(path: "..", turbo_modules_enabled: true)
# pod 'React-turbomodule-samples', :path => '../ReactCommon/turbomodule/samples'

# Additional Pods which aren't included in the default Podfile
pod 'React-ART', :path => '../Libraries/ART'
pod 'React-RCTPushNotification', :path => '../Libraries/PushNotificationIOS'

# Additional Pods which are classed as unstable
#
# To use fabric: add `fabric_enabled` option to the use_react_native method above, like below
# use_react_native!(path: "..", turbo_modules_enabled: true, fabric_enabled: true)
end
65 changes: 32 additions & 33 deletions RNTester/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ PODS:
- yoga (1000.0.0.React)

DEPENDENCIES:
- boost-for-react-native (from `../third-party-podspecs/boost-for-react-native.podspec`)
- DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`)
- Folly (from `../third-party-podspecs/Folly.podspec`)
- glog (from `../third-party-podspecs/glog.podspec`)
Expand Down Expand Up @@ -149,11 +150,9 @@ DEPENDENCIES:
- React-turbomodule-samples (from `../ReactCommon/turbomodule/samples`)
- yoga (from `../ReactCommon/yoga`)

SPEC REPOS:
https://cdn.cocoapods.org/:
- boost-for-react-native

EXTERNAL SOURCES:
boost-for-react-native:
:podspec: "../third-party-podspecs/boost-for-react-native.podspec"
DoubleConversion:
:podspec: "../third-party-podspecs/DoubleConversion.podspec"
Folly:
Expand Down Expand Up @@ -212,36 +211,36 @@ EXTERNAL SOURCES:
:path: "../ReactCommon/yoga"

SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
React: 90525e0418f1344a37cd3153a1ae60c85d07237d
React-ART: b68b1bb10eac98b425561bbb8e9ca04927dc767b
React-Core: f4c91767b26930d46b9bded8b0a1f752e57c7042
React-cxxreact: a570317cb3cc2767f48000037265f6bfd8e8598c
React-DevSupport: a89903ccfccc3310afe3c1e55162a413ab034712
React-fishhook: 7659111ba87ec08fd64255593517e7120b2a9547
React-jscallinvoker: 4d91f1d60b861b10f4c69e5ef2489c0f4ca9e811
React-jsi: 7102afd8cc050c6ff25ae945f2f15cdcb4ed0fd7
React-jsiexecutor: 233645af3dcb019be76d651d6e9595ca4496d7de
React-jsinspector: 0d86a7a746f2596735b4ad00f7de3bb6583a78b6
React-RCTActionSheet: ac6b8fa35d816b6cab00d355f548d1f3608fb8ce
React-RCTAnimation: a8a0281d60b89cfd127df889b543d3d25de78e03
React-RCTBlob: b14b3a2a96bf68b3e6657afe5e342db982eafa30
boost-for-react-native: a110407d9db2642fd2e1bcd7c5a51c81f2521dc9
DoubleConversion: a1bc12a74baa397a2609e0f10e19b8062d864053
Folly: feff29ba9d0b7c2e4f793a94942831d6cc5bbad7
glog: b3f6d74f3e2d33396addc0ee724d2b2b79fc3e00
React: 74861516f70acbdca7b2548aa557bf8deee9698d
React-ART: 08abf61755c11f2adbc78ae6e2f5b087a403a677
React-Core: aa142862b5ebdf94e003787e22417865e1c1016c
React-cxxreact: 3e49ca16e0117d19b859450041c7fe4dc9296399
React-DevSupport: 91d8812ad81fbfa8084b06e131e3d80087c665e9
React-fishhook: 1a55e7b86dcab2d0e0db1268681365c3f5eefe0a
React-jscallinvoker: f84d92e0e70a0f8a04907d0682a7c58533708b67
React-jsi: 87033eb3052f4e6b8bf54af32c8f0a29ffbec13c
React-jsiexecutor: 9af31e4fb3c7157d6437d11a4686974ffd5310b7
React-jsinspector: bd0f3d1d100ec90008bdceeecc3b2ccde15f349c
React-RCTActionSheet: c3adb7754a32492fc5e0bcaf2395221006588b6b
React-RCTAnimation: ed93d0ae9533f117e0512738338c4c8479a8925e
React-RCTBlob: f4387573b7c109b6feed2f7b6453cf326854bfdc
React-RCTCameraRoll: bb4e89e505fddd8a48c76db827e3e43b23b437e3
React-RCTImage: a25d418a77b25c915742f2e6bf3c76d47f5148c8
React-RCTLinking: 39f07f20199693080626617d3f325a89f975f1a4
React-RCTNetwork: 226ed1a90335561046030ce0c5b408e569508694
React-RCTPushNotification: 4e2f1425df2135cc87e44402d07432a98a5637fb
React-RCTSettings: 7f7114c4eb845032be3bd5245ed3d306d06ae5eb
React-RCTText: 709d42db0b10f398d8796d7d665392f4ea831fe5
React-RCTVibration: 85bd64221f0f5e918dd83c2f90cb96f89dc0a49d
React-RCTWebSocket: e1c9aaa85aac0c97d90095f509215adbf5a6104f
React-turbomodule-core: 9b98fcff0ab628486af1f7e660f1b49556230282
React-turbomodule-samples: 9a1d520489c1cd337c5e8714b6b80f6772586a7c
yoga: 465ed50746ee55b6073ba80c39ae6aed457b500a
React-RCTImage: 841010ce5a7a0eb96bc3f22659560a176a254fc9
React-RCTLinking: 4fe50097a4d8c9649b25fd6639257aa475530656
React-RCTNetwork: b7bf49cc581752158e8aeee3e9aae83ab61fbcd0
React-RCTPushNotification: 79cbb2aaf51f65b94e844c876f462ec07be33ac5
React-RCTSettings: 1ad264bf310d7cf7f2b29c94836b84e5a0ca1561
React-RCTText: 21e57ebc1cc19db1b74cf40280c3a0360f760dcb
React-RCTVibration: d9a3da17bd5d3f4d8b57a40e3e7fb842f7e62694
React-RCTWebSocket: 7bb0868fafa9e8ed961a8f87879e2d2bf7946b3d
React-turbomodule-core: 970dd38c0e59a09b5919e0a097abdd099c4ae9a7
React-turbomodule-samples: 4d9081847444fe313ac06bb6ec604c35e49ba8c7
yoga: fb23117669f477b0f4b3849d6999414cba0c69b7

PODFILE CHECKSUM: e5503e6ee378aa045f62c2d8df8d7f93a83152d6
PODFILE CHECKSUM: 0fe24de33063625557c3c388037ac21ef86e5057

COCOAPODS: 1.8.4
Empty file added RNTester/RNTester-macOS/RNTester_macOS.entitlements
View file
Open in desktop
Empty file.
Loading