Skip to content

Commit dc7c50b

Browse files
alloyalloy
authored
[RNTester] Remove need to update lockfile after cutting new build (#219)
There’s no real need for RNTester to use MS specific versions. So simply removing those from the system will make the lockfile stable, as far as versions go, just like the upstream version. Closes #218
1 parent 7317f67 commit dc7c50b

File tree

2 files changed

+151
-116
lines changed

2 files changed

+151
-116
lines changed

‎RNTester/Podfile‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
# [TODO(macOS GH#217)
2+
#
3+
# This monkey-patching of the CocoaPods Specification class will strip our MS versions from the specifications and
4+
# replace them with `1000.0.0`, which is the version that upstream always has set in `master`.
5+
module StripMSVersion
6+
require 'cocoapods-core/specification'
7+
Pod::Specification.prepend(self)
8+
9+
def source=(source)
10+
if source.is_a?(Hash) && source.has_key?(:tag)
11+
super(source.merge(:tag => StripMSVersion.strip(source[:tag])))
12+
else
13+
super
14+
end
15+
end
16+
17+
def version=(version)
18+
super(StripMSVersion.strip(version))
19+
end
20+
21+
def dependency(dep, *args)
22+
version, *other_version_requirements = args
23+
super(dep, *[StripMSVersion.strip(version), *other_version_requirements].compact)
24+
end
25+
26+
private
27+
28+
VERSION_REGEXP = /\d+\.\d+\.\d+-microsoft\.\d+/
29+
30+
def self.strip(version)
31+
version && version.sub(VERSION_REGEXP, '1000.0.0')
32+
end
33+
end
34+
# ]TODO(macOS GH#214)
35+
136
source 'https://cdn.cocoapods.org/'
237

338
platform :ios, '9.0'

‎RNTester/Podfile.lock‎

Lines changed: 116 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -11,113 +11,113 @@ PODS:
1111
- DoubleConversion
1212
- glog
1313
- glog (0.3.5)
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):
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):
3030
- Folly (= 2018.10.22.00)
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):
31+
- React-cxxreact (= 1000.0.0)
32+
- React-jsiexecutor (= 1000.0.0)
33+
- yoga (= 1000.0.0.React)
34+
- React-cxxreact (1000.0.0):
3535
- boost-for-react-native (= 1.63.0)
3636
- DoubleConversion
3737
- Folly (= 2018.10.22.00)
3838
- glog
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):
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-jscallinvoker (1000.0.0):
4545
- Folly (= 2018.10.22.00)
46-
- React-cxxreact (= 0.60.0-microsoft.31)
47-
- React-jsi (0.60.0-microsoft.31):
46+
- React-cxxreact (= 1000.0.0)
47+
- React-jsi (1000.0.0):
4848
- boost-for-react-native (= 1.63.0)
4949
- DoubleConversion
5050
- Folly (= 2018.10.22.00)
5151
- glog
52-
- React-jsi/Default (= 0.60.0-microsoft.31)
53-
- React-jsi/Default (0.60.0-microsoft.31):
52+
- React-jsi/Default (= 1000.0.0)
53+
- React-jsi/Default (1000.0.0):
5454
- boost-for-react-native (= 1.63.0)
5555
- DoubleConversion
5656
- Folly (= 2018.10.22.00)
5757
- glog
58-
- React-jsiexecutor (0.60.0-microsoft.31):
58+
- React-jsiexecutor (1000.0.0):
5959
- DoubleConversion
6060
- Folly (= 2018.10.22.00)
6161
- glog
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):
62+
- React-cxxreact (= 1000.0.0)
63+
- React-jsi (= 1000.0.0)
64+
- React-jsinspector (1000.0.0)
65+
- React-RCTActionSheet (1000.0.0):
66+
- React-Core (= 1000.0.0)
67+
- React-RCTAnimation (1000.0.0):
68+
- React-Core (= 1000.0.0)
69+
- React-RCTBlob (1000.0.0):
70+
- React-Core (= 1000.0.0)
71+
- React-RCTNetwork (= 1000.0.0)
72+
- React-RCTWebSocket (= 1000.0.0)
73+
- React-RCTCameraRoll (1000.0.0):
74+
- React-Core (= 1000.0.0)
75+
- React-RCTImage (= 1000.0.0)
76+
- React-RCTImage (1000.0.0):
77+
- React-Core (= 1000.0.0)
78+
- React-RCTNetwork (= 1000.0.0)
79+
- React-RCTLinking (1000.0.0):
80+
- React-Core (= 1000.0.0)
81+
- React-RCTNetwork (1000.0.0):
82+
- React-Core (= 1000.0.0)
83+
- React-RCTPushNotification (1000.0.0):
84+
- React-Core (= 1000.0.0)
85+
- React-RCTSettings (1000.0.0):
86+
- React-Core (= 1000.0.0)
87+
- React-RCTText (1000.0.0):
88+
- React-Core (= 1000.0.0)
89+
- React-RCTVibration (1000.0.0):
90+
- React-Core (= 1000.0.0)
91+
- React-RCTWebSocket (1000.0.0):
92+
- React-Core (= 1000.0.0)
93+
- React-fishhook (= 1000.0.0)
94+
- React-turbomodule-core (1000.0.0):
9595
- Folly (= 2018.10.22.00)
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):
96+
- React-Core (= 1000.0.0)
97+
- React-cxxreact (= 1000.0.0)
98+
- React-jscallinvoker (= 1000.0.0)
99+
- React-jsi (= 1000.0.0)
100+
- React-turbomodule-core/core-ios (= 1000.0.0)
101+
- React-turbomodule-core/core-ios (1000.0.0):
102102
- Folly (= 2018.10.22.00)
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):
103+
- React-Core (= 1000.0.0)
104+
- React-cxxreact (= 1000.0.0)
105+
- React-jscallinvoker (= 1000.0.0)
106+
- React-jsi (= 1000.0.0)
107+
- React-turbomodule-samples (1000.0.0):
108108
- Folly (= 2018.10.22.00)
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):
109+
- React-Core (= 1000.0.0)
110+
- React-cxxreact (= 1000.0.0)
111+
- React-jsi (= 1000.0.0)
112+
- React-turbomodule-core (= 1000.0.0)
113+
- React-turbomodule-samples/samples-ios (= 1000.0.0)
114+
- React-turbomodule-samples/samples-ios (1000.0.0):
115115
- Folly (= 2018.10.22.00)
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)
116+
- React-Core (= 1000.0.0)
117+
- React-cxxreact (= 1000.0.0)
118+
- React-jsi (= 1000.0.0)
119+
- React-turbomodule-core (= 1000.0.0)
120+
- yoga (1000.0.0.React)
121121

122122
DEPENDENCIES:
123123
- DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`)
@@ -150,7 +150,7 @@ DEPENDENCIES:
150150
- yoga (from `../ReactCommon/yoga`)
151151

152152
SPEC REPOS:
153-
trunk:
153+
https://cdn.cocoapods.org/:
154154
- boost-for-react-native
155155

156156
EXTERNAL SOURCES:
@@ -213,35 +213,35 @@ EXTERNAL SOURCES:
213213

214214
SPEC CHECKSUMS:
215215
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
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
216+
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
217+
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
218+
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
219+
React: 90525e0418f1344a37cd3153a1ae60c85d07237d
220+
React-ART: b68b1bb10eac98b425561bbb8e9ca04927dc767b
221+
React-Core: f4c91767b26930d46b9bded8b0a1f752e57c7042
222+
React-cxxreact: a570317cb3cc2767f48000037265f6bfd8e8598c
223+
React-DevSupport: a89903ccfccc3310afe3c1e55162a413ab034712
224+
React-fishhook: 7659111ba87ec08fd64255593517e7120b2a9547
225+
React-jscallinvoker: 4d91f1d60b861b10f4c69e5ef2489c0f4ca9e811
226+
React-jsi: 7102afd8cc050c6ff25ae945f2f15cdcb4ed0fd7
227+
React-jsiexecutor: 233645af3dcb019be76d651d6e9595ca4496d7de
228+
React-jsinspector: 0d86a7a746f2596735b4ad00f7de3bb6583a78b6
229+
React-RCTActionSheet: ac6b8fa35d816b6cab00d355f548d1f3608fb8ce
230+
React-RCTAnimation: a8a0281d60b89cfd127df889b543d3d25de78e03
231+
React-RCTBlob: b14b3a2a96bf68b3e6657afe5e342db982eafa30
232+
React-RCTCameraRoll: bb4e89e505fddd8a48c76db827e3e43b23b437e3
233+
React-RCTImage: a25d418a77b25c915742f2e6bf3c76d47f5148c8
234+
React-RCTLinking: 39f07f20199693080626617d3f325a89f975f1a4
235+
React-RCTNetwork: 226ed1a90335561046030ce0c5b408e569508694
236+
React-RCTPushNotification: 4e2f1425df2135cc87e44402d07432a98a5637fb
237+
React-RCTSettings: 7f7114c4eb845032be3bd5245ed3d306d06ae5eb
238+
React-RCTText: 709d42db0b10f398d8796d7d665392f4ea831fe5
239+
React-RCTVibration: 85bd64221f0f5e918dd83c2f90cb96f89dc0a49d
240+
React-RCTWebSocket: e1c9aaa85aac0c97d90095f509215adbf5a6104f
241+
React-turbomodule-core: 9b98fcff0ab628486af1f7e660f1b49556230282
242+
React-turbomodule-samples: 9a1d520489c1cd337c5e8714b6b80f6772586a7c
243+
yoga: 465ed50746ee55b6073ba80c39ae6aed457b500a
244244

245-
PODFILE CHECKSUM: 677959aa322a0a559343b5810d7a39e759214b56
245+
PODFILE CHECKSUM: e5503e6ee378aa045f62c2d8df8d7f93a83152d6
246246

247247
COCOAPODS: 1.8.4

0 commit comments

Comments
 (0)