Skip to content

Commit 88d8823

Browse files
alloyalloy
authored
[RNTester] Make iOS target work with CocoaPods again (#209)
* [RNTester] Make iOS target build with CocoaPods again. * [RNTester] Expicitly use CocoaPods CDN spec repo * [RNTester] Check-in pod install artefacts * [RNTester] Add CameraRoll pod dependency back At least for now so we’re in sync with upstream v0.60.0
1 parent 7abd5c4 commit 88d8823

File tree

9 files changed

+130
-151
lines changed

9 files changed

+130
-151
lines changed

‎Libraries/Text/TextInput/Multiline/RCTUITextView.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#import <React/RCTUIKit.h> // TODO(macOS ISS#2323203)
99

10-
#import <RCTText/RCTTextUIKit.h> // TODO(macOS ISS#2323203)
10+
#import "RCTTextUIKit.h" // TODO(macOS ISS#2323203)
1111

1212
#import "RCTBackedTextInputViewProtocol.h"
1313

‎Libraries/Text/TextInput/Multiline/RCTUITextView.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
#import <RCTText/RCTUITextView.h>
8+
#import "RCTUITextView.h"
99

1010
#import <React/RCTUtils.h>
1111
#import <React/UIView+React.h>

‎Libraries/Text/TextInput/Singleline/RCTUITextField.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#import <React/RCTUIKit.h> // TODO(macOS ISS#2323203)
99

10-
#import <RCTText/RCTTextUIKit.h> // TODO(macOS ISS#2323203)
10+
#import "RCTTextUIKit.h" // TODO(macOS ISS#2323203)
1111

1212
#import "RCTBackedTextInputViewProtocol.h"
1313

‎RNTester/Podfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
source 'https://cdn.cocoapods.org/'
2+
13
platform :ios, '9.0'
24

35
require_relative '../scripts/autolink-ios'
@@ -13,6 +15,7 @@ target 'RNTester' do
1315
pod 'React-turbomodule-samples', :path => '../ReactCommon/turbomodule/samples'
1416

1517
# Additional Pods which aren't included in the default Podfile
18+
pod 'React-RCTCameraRoll', :path => '../Libraries/CameraRoll'
1619
pod 'React-ART', :path => '../Libraries/ART'
1720
pod 'React-RCTPushNotification', :path => '../Libraries/PushNotificationIOS'
1821

‎RNTester/Podfile.lock‎

Lines changed: 121 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -11,108 +11,113 @@ PODS:
1111
- DoubleConversion
1212
- glog
1313
- glog (0.3.5)
14-
- React (1000.0.0):
15-
- React-Core (= 1000.0.0)
16-
- React-DevSupport (= 1000.0.0)
17-
- React-RCTActionSheet (= 1000.0.0)
18-
- React-RCTAnimation (= 1000.0.0)
19-
- React-RCTBlob (= 1000.0.0)
20-
- React-RCTImage (= 1000.0.0)
21-
- React-RCTLinking (= 1000.0.0)
22-
- React-RCTNetwork (= 1000.0.0)
23-
- React-RCTSettings (= 1000.0.0)
24-
- React-RCTText (= 1000.0.0)
25-
- React-RCTVibration (= 1000.0.0)
26-
- React-RCTWebSocket (= 1000.0.0)
27-
- React-ART (1000.0.0):
28-
- React-Core (= 1000.0.0)
29-
- React-Core (1000.0.0):
14+
- React (0.60.0-microsoft.31):
15+
- React-Core (= 0.60.0-microsoft.31)
16+
- React-DevSupport (= 0.60.0-microsoft.31)
17+
- React-RCTActionSheet (= 0.60.0-microsoft.31)
18+
- React-RCTAnimation (= 0.60.0-microsoft.31)
19+
- React-RCTBlob (= 0.60.0-microsoft.31)
20+
- React-RCTImage (= 0.60.0-microsoft.31)
21+
- React-RCTLinking (= 0.60.0-microsoft.31)
22+
- React-RCTNetwork (= 0.60.0-microsoft.31)
23+
- React-RCTSettings (= 0.60.0-microsoft.31)
24+
- React-RCTText (= 0.60.0-microsoft.31)
25+
- React-RCTVibration (= 0.60.0-microsoft.31)
26+
- React-RCTWebSocket (= 0.60.0-microsoft.31)
27+
- React-ART (0.60.0-microsoft.31):
28+
- React-Core (= 0.60.0-microsoft.31)
29+
- React-Core (0.60.0-microsoft.31):
3030
- Folly (= 2018.10.22.00)
31-
- React-cxxreact (= 1000.0.0)
32-
- React-jsiexecutor (= 1000.0.0)
33-
- yoga (= 1000.0.0.React)
34-
- React-cxxreact (1000.0.0):
31+
- React-cxxreact (= 0.60.0-microsoft.31)
32+
- React-jsiexecutor (= 0.60.0-microsoft.31)
33+
- yoga (= 0.60.0-microsoft.31.React)
34+
- React-cxxreact (0.60.0-microsoft.31):
3535
- boost-for-react-native (= 1.63.0)
3636
- DoubleConversion
3737
- Folly (= 2018.10.22.00)
3838
- glog
39-
- React-jsinspector (= 1000.0.0)
40-
- React-DevSupport (1000.0.0):
41-
- React-Core (= 1000.0.0)
42-
- React-RCTWebSocket (= 1000.0.0)
43-
- React-fishhook (1000.0.0)
44-
- React-jsi (1000.0.0):
39+
- React-jsinspector (= 0.60.0-microsoft.31)
40+
- React-DevSupport (0.60.0-microsoft.31):
41+
- React-Core (= 0.60.0-microsoft.31)
42+
- React-RCTWebSocket (= 0.60.0-microsoft.31)
43+
- React-fishhook (0.60.0-microsoft.31)
44+
- React-jscallinvoker (0.60.0-microsoft.31):
45+
- Folly (= 2018.10.22.00)
46+
- React-cxxreact (= 0.60.0-microsoft.31)
47+
- React-jsi (0.60.0-microsoft.31):
4548
- boost-for-react-native (= 1.63.0)
4649
- DoubleConversion
4750
- Folly (= 2018.10.22.00)
4851
- glog
49-
- React-jsi/Default (= 1000.0.0)
50-
- React-jsi/Default (1000.0.0):
52+
- React-jsi/Default (= 0.60.0-microsoft.31)
53+
- React-jsi/Default (0.60.0-microsoft.31):
5154
- boost-for-react-native (= 1.63.0)
5255
- DoubleConversion
5356
- Folly (= 2018.10.22.00)
5457
- glog
55-
- React-jsiexecutor (1000.0.0):
58+
- React-jsiexecutor (0.60.0-microsoft.31):
5659
- DoubleConversion
5760
- Folly (= 2018.10.22.00)
5861
- glog
59-
- React-cxxreact (= 1000.0.0)
60-
- React-jsi (= 1000.0.0)
61-
- React-jsinspector (1000.0.0)
62-
- React-RCTActionSheet (1000.0.0):
63-
- React-Core (= 1000.0.0)
64-
- React-RCTAnimation (1000.0.0):
65-
- React-Core (= 1000.0.0)
66-
- React-RCTBlob (1000.0.0):
67-
- React-Core (= 1000.0.0)
68-
- React-RCTNetwork (= 1000.0.0)
69-
- React-RCTWebSocket (= 1000.0.0)
70-
- React-RCTCameraRoll (1000.0.0):
71-
- React-Core (= 1000.0.0)
72-
- React-RCTImage (= 1000.0.0)
73-
- React-RCTImage (1000.0.0):
74-
- React-Core (= 1000.0.0)
75-
- React-RCTNetwork (= 1000.0.0)
76-
- React-RCTLinking (1000.0.0):
77-
- React-Core (= 1000.0.0)
78-
- React-RCTNetwork (1000.0.0):
79-
- React-Core (= 1000.0.0)
80-
- React-RCTPushNotification (1000.0.0):
81-
- React-Core (= 1000.0.0)
82-
- React-RCTSettings (1000.0.0):
83-
- React-Core (= 1000.0.0)
84-
- React-RCTText (1000.0.0):
85-
- React-Core (= 1000.0.0)
86-
- React-RCTVibration (1000.0.0):
87-
- React-Core (= 1000.0.0)
88-
- React-RCTWebSocket (1000.0.0):
89-
- React-Core (= 1000.0.0)
90-
- React-fishhook (= 1000.0.0)
91-
- React-turbomodule-core (1000.0.0):
62+
- React-cxxreact (= 0.60.0-microsoft.31)
63+
- React-jsi (= 0.60.0-microsoft.31)
64+
- React-jsinspector (0.60.0-microsoft.31)
65+
- React-RCTActionSheet (0.60.0-microsoft.31):
66+
- React-Core (= 0.60.0-microsoft.31)
67+
- React-RCTAnimation (0.60.0-microsoft.31):
68+
- React-Core (= 0.60.0-microsoft.31)
69+
- React-RCTBlob (0.60.0-microsoft.31):
70+
- React-Core (= 0.60.0-microsoft.31)
71+
- React-RCTNetwork (= 0.60.0-microsoft.31)
72+
- React-RCTWebSocket (= 0.60.0-microsoft.31)
73+
- React-RCTCameraRoll (0.60.0-microsoft.31):
74+
- React-Core (= 0.60.0-microsoft.31)
75+
- React-RCTImage (= 0.60.0-microsoft.31)
76+
- React-RCTImage (0.60.0-microsoft.31):
77+
- React-Core (= 0.60.0-microsoft.31)
78+
- React-RCTNetwork (= 0.60.0-microsoft.31)
79+
- React-RCTLinking (0.60.0-microsoft.31):
80+
- React-Core (= 0.60.0-microsoft.31)
81+
- React-RCTNetwork (0.60.0-microsoft.31):
82+
- React-Core (= 0.60.0-microsoft.31)
83+
- React-RCTPushNotification (0.60.0-microsoft.31):
84+
- React-Core (= 0.60.0-microsoft.31)
85+
- React-RCTSettings (0.60.0-microsoft.31):
86+
- React-Core (= 0.60.0-microsoft.31)
87+
- React-RCTText (0.60.0-microsoft.31):
88+
- React-Core (= 0.60.0-microsoft.31)
89+
- React-RCTVibration (0.60.0-microsoft.31):
90+
- React-Core (= 0.60.0-microsoft.31)
91+
- React-RCTWebSocket (0.60.0-microsoft.31):
92+
- React-Core (= 0.60.0-microsoft.31)
93+
- React-fishhook (= 0.60.0-microsoft.31)
94+
- React-turbomodule-core (0.60.0-microsoft.31):
9295
- Folly (= 2018.10.22.00)
93-
- React-Core (= 1000.0.0)
94-
- React-cxxreact (= 1000.0.0)
95-
- React-jsi (= 1000.0.0)
96-
- React-turbomodule-core/core-ios (= 1000.0.0)
97-
- React-turbomodule-core/core-ios (1000.0.0):
96+
- React-Core (= 0.60.0-microsoft.31)
97+
- React-cxxreact (= 0.60.0-microsoft.31)
98+
- React-jscallinvoker (= 0.60.0-microsoft.31)
99+
- React-jsi (= 0.60.0-microsoft.31)
100+
- React-turbomodule-core/core-ios (= 0.60.0-microsoft.31)
101+
- React-turbomodule-core/core-ios (0.60.0-microsoft.31):
98102
- Folly (= 2018.10.22.00)
99-
- React-Core (= 1000.0.0)
100-
- React-cxxreact (= 1000.0.0)
101-
- React-jsi (= 1000.0.0)
102-
- React-turbomodule-samples (1000.0.0):
103+
- React-Core (= 0.60.0-microsoft.31)
104+
- React-cxxreact (= 0.60.0-microsoft.31)
105+
- React-jscallinvoker (= 0.60.0-microsoft.31)
106+
- React-jsi (= 0.60.0-microsoft.31)
107+
- React-turbomodule-samples (0.60.0-microsoft.31):
103108
- Folly (= 2018.10.22.00)
104-
- React-Core (= 1000.0.0)
105-
- React-cxxreact (= 1000.0.0)
106-
- React-jsi (= 1000.0.0)
107-
- React-turbomodule-core (= 1000.0.0)
108-
- React-turbomodule-samples/samples-ios (= 1000.0.0)
109-
- React-turbomodule-samples/samples-ios (1000.0.0):
109+
- React-Core (= 0.60.0-microsoft.31)
110+
- React-cxxreact (= 0.60.0-microsoft.31)
111+
- React-jsi (= 0.60.0-microsoft.31)
112+
- React-turbomodule-core (= 0.60.0-microsoft.31)
113+
- React-turbomodule-samples/samples-ios (= 0.60.0-microsoft.31)
114+
- React-turbomodule-samples/samples-ios (0.60.0-microsoft.31):
110115
- Folly (= 2018.10.22.00)
111-
- React-Core (= 1000.0.0)
112-
- React-cxxreact (= 1000.0.0)
113-
- React-jsi (= 1000.0.0)
114-
- React-turbomodule-core (= 1000.0.0)
115-
- yoga (1000.0.0.React)
116+
- React-Core (= 0.60.0-microsoft.31)
117+
- React-cxxreact (= 0.60.0-microsoft.31)
118+
- React-jsi (= 0.60.0-microsoft.31)
119+
- React-turbomodule-core (= 0.60.0-microsoft.31)
120+
- yoga (0.60.0-microsoft.31.React)
116121

117122
DEPENDENCIES:
118123
- DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`)
@@ -124,6 +129,7 @@ DEPENDENCIES:
124129
- React-cxxreact (from `../ReactCommon/cxxreact`)
125130
- React-DevSupport (from `../React`)
126131
- React-fishhook (from `../Libraries/fishhook`)
132+
- React-jscallinvoker (from `../ReactCommon/jscallinvoker`)
127133
- React-jsi (from `../ReactCommon/jsi`)
128134
- React-jsiexecutor (from `../ReactCommon/jsiexecutor`)
129135
- React-jsinspector (from `../ReactCommon/jsinspector`)
@@ -144,7 +150,7 @@ DEPENDENCIES:
144150
- yoga (from `../ReactCommon/yoga`)
145151

146152
SPEC REPOS:
147-
https://github.com/cocoapods/specs.git:
153+
trunk:
148154
- boost-for-react-native
149155

150156
EXTERNAL SOURCES:
@@ -166,6 +172,8 @@ EXTERNAL SOURCES:
166172
:path: "../React"
167173
React-fishhook:
168174
:path: "../Libraries/fishhook"
175+
React-jscallinvoker:
176+
:path: "../ReactCommon/jscallinvoker"
169177
React-jsi:
170178
:path: "../ReactCommon/jsi"
171179
React-jsiexecutor:
@@ -205,34 +213,35 @@ EXTERNAL SOURCES:
205213

206214
SPEC CHECKSUMS:
207215
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
208-
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
209-
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
210-
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
211-
React: e7b61c9123f89c4cd9becea2122af02568be6e13
212-
React-ART: 3dba78ec04b585a82456d1df4bda7a08dbc83a8d
213-
React-Core: d1c3aa4b1c5c57bf839de3c83396b59c1efbf1ba
214-
React-cxxreact: 5f2b678adbe8ff5256801603e1b496e481bc2430
215-
React-DevSupport: 9bde3ce4f7707d9487759101ea3188f4f07c9003
216-
React-fishhook: a9a43c2c84ab2519809810bcdd363e2774007c69
217-
React-jsi: cdf32eb002ff3e243364a1abb71925e0e93003db
218-
React-jsiexecutor: 6e53c44a5371297f0c9cc39780f12cb3efba3b81
219-
React-jsinspector: 2f42a591151e828d0422cbd3b609eedcb920d58e
220-
React-RCTActionSheet: 4ad4bfac1ba9ec020edf278362855448d607cafd
221-
React-RCTAnimation: f050e9fbe85e5616f74cea7a2557bdfb6be73cee
222-
React-RCTBlob: 9f907aab3417a43bbda84aef76f88ee528e877d4
223-
React-RCTCameraRoll: 288b1007d8e540771b917f89d7d99118a3477ee1
224-
React-RCTImage: 4234a754ebdb922416f5f77cff121c680fd3ccbe
225-
React-RCTLinking: 3a52500942cc73999df19f541b7bda5887c3c43d
226-
React-RCTNetwork: 2042d2648e1160770ac0e5068bb5b648c03296a5
227-
React-RCTPushNotification: 3cfbf863d0597b5da80a15c9a9285a0ad89b23ba
228-
React-RCTSettings: 8099c9d904c0fbe46c463de8791478b5bc72809e
229-
React-RCTText: c4a643a08fce4727316366fea5ad17fa14f72f54
230-
React-RCTVibration: c5933466242187bffe55fa5496f841e04db66c8a
231-
React-RCTWebSocket: 233c66a6394de3816ee46861bbe0dba9f83e45a0
232-
React-turbomodule-core: 7ae77c38b85f6f81be40c0c3dc456d3a5fda4797
233-
React-turbomodule-samples: 483f2c80e81b89197737828405a0ac27c77f58b5
234-
yoga: 56698cdff46e3dbb7aa71fd2fd7dc0ce650dc0fb
216+
DoubleConversion: a1bc12a74baa397a2609e0f10e19b8062d864053
217+
Folly: feff29ba9d0b7c2e4f793a94942831d6cc5bbad7
218+
glog: b3f6d74f3e2d33396addc0ee724d2b2b79fc3e00
219+
React: b5a3398fce30ef63a15fa4c909fcc1cd9fdf8e37
220+
React-ART: e98935ffbd67852fcffa965db1ac02fd77202036
221+
React-Core: 61a52828fcbe458ede989812e58ae62fd6434796
222+
React-cxxreact: 661878b284460f711e02b267c9ce50eecd7683f9
223+
React-DevSupport: b513ed36ee2e05a0964e829d57e6d39550048de2
224+
React-fishhook: d7094ee5cac1a8a49ace9319e2568666be81e7f8
225+
React-jscallinvoker: 6bf052d499320324d9153a9425e692c8250928f5
226+
React-jsi: 86164349713bb31a45bf4db21492681d88e3b586
227+
React-jsiexecutor: 71675f24ac9519d540e123054d40f630afeb4997
228+
React-jsinspector: f2a63105da46a2b7c53888d338d20cdff1de0018
229+
React-RCTActionSheet: 189dcaa5f967c93e673d89d061e899d3217fd292
230+
React-RCTAnimation: c54c5b1b66723756f3a7b8b4979a226e6844fea3
231+
React-RCTBlob: d3f81fd28e166f932220873ca3ed8a1e63054694
232+
React-RCTCameraRoll: 4052d0d3a3e0ecbf8adfc7e58f7a9a208768c4f6
233+
React-RCTImage: c1ffad410730573c327c227e4f8da45c9e8bc680
234+
React-RCTLinking: 3b6545fdce7ac1df7c29097204b551feb94b7c68
235+
React-RCTNetwork: 316be64bb95cf3fcf0fab5898b3ad5b89e09d8d2
236+
React-RCTPushNotification: 1a572abe9735a00e31359575bab53c86b69b03ec
237+
React-RCTSettings: 4ce3161d982c126c7419624be8a1193e801e3de6
238+
React-RCTText: 4de126dbc8253e311ed83bd81317d7cfb573c91c
239+
React-RCTVibration: dd431f2f913c34b018267b417831fcd4843b3d2a
240+
React-RCTWebSocket: 448fa048c31527da92946944b65b1996c855ff50
241+
React-turbomodule-core: 630128e4e3d4bc307931052e069c68a42a52d2fd
242+
React-turbomodule-samples: 27cade951858959365b7c3a744b5907a098acb2d
243+
yoga: 18681a34e39bf843425427996d459c5e6f5d52b4
235244

236-
PODFILE CHECKSUM: bb578b8286c0068879a41ac092c9690cc3ede523
245+
PODFILE CHECKSUM: 677959aa322a0a559343b5810d7a39e759214b56
237246

238-
COCOAPODS: 1.6.3
247+
COCOAPODS: 1.8.4

0 commit comments

Comments
 (0)