Skip to content

Commit d2b7e1f

Browse files
michalchudziakmichalchudziak
committed
Minor build fixes
1 parent f262757 commit d2b7e1f

File tree

4 files changed

+79
-83
lines changed

4 files changed

+79
-83
lines changed

‎example/java/app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
project.ext.react = [
4-
entryFile: "example/index.js"
4+
entryFile: "example/index.js",
5+
root: "../../.."
56
]
67

78
apply from: "../../../node_modules/react-native/react.gradle"

‎example/kotlin/app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
project.ext.react = [
8-
entryFile: "example/index.js"
8+
entryFile: "example/index.js",
9+
root: "../../.."
910
]
1011

1112
apply from: "../../../node_modules/react-native/react.gradle"

‎example/objc/NativeExample.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
);
173173
runOnlyForDeploymentPostprocessing = 0;
174174
shellPath = /bin/sh;
175-
shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
175+
shellScript = "export NODE_BINARY=node\nENTRY_FILE=example/index.js ../../node_modules/react-native/scripts/react-native-xcode.sh\n";
176176
};
177177
28DA8C6422C280E800A3A764 /* Start Packager */ = {
178178
isa = PBXShellScriptBuildPhase;

‎example/objc/Podfile.lock

Lines changed: 74 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -11,81 +11,79 @@ PODS:
1111
- DoubleConversion
1212
- glog
1313
- glog (0.3.5)
14-
- React (0.60.0):
15-
- React-Core (= 0.60.0)
16-
- React-DevSupport (= 0.60.0)
17-
- React-RCTActionSheet (= 0.60.0)
18-
- React-RCTAnimation (= 0.60.0)
19-
- React-RCTBlob (= 0.60.0)
20-
- React-RCTImage (= 0.60.0)
21-
- React-RCTLinking (= 0.60.0)
22-
- React-RCTNetwork (= 0.60.0)
23-
- React-RCTSettings (= 0.60.0)
24-
- React-RCTText (= 0.60.0)
25-
- React-RCTVibration (= 0.60.0)
26-
- React-RCTWebSocket (= 0.60.0)
27-
- React-Core (0.60.0):
14+
- React (0.60.5):
15+
- React-Core (= 0.60.5)
16+
- React-DevSupport (= 0.60.5)
17+
- React-RCTActionSheet (= 0.60.5)
18+
- React-RCTAnimation (= 0.60.5)
19+
- React-RCTBlob (= 0.60.5)
20+
- React-RCTImage (= 0.60.5)
21+
- React-RCTLinking (= 0.60.5)
22+
- React-RCTNetwork (= 0.60.5)
23+
- React-RCTSettings (= 0.60.5)
24+
- React-RCTText (= 0.60.5)
25+
- React-RCTVibration (= 0.60.5)
26+
- React-RCTWebSocket (= 0.60.5)
27+
- React-Core (0.60.5):
2828
- Folly (= 2018.10.22.00)
29-
- React-cxxreact (= 0.60.0)
30-
- React-jsiexecutor (= 0.60.0)
31-
- yoga (= 0.60.0.React)
32-
- React-cxxreact (0.60.0):
29+
- React-cxxreact (= 0.60.5)
30+
- React-jsiexecutor (= 0.60.5)
31+
- yoga (= 0.60.5.React)
32+
- React-cxxreact (0.60.5):
3333
- boost-for-react-native (= 1.63.0)
3434
- DoubleConversion
3535
- Folly (= 2018.10.22.00)
3636
- glog
37-
- React-jsinspector (= 0.60.0)
38-
- React-DevSupport (0.60.0):
39-
- React-Core (= 0.60.0)
40-
- React-RCTWebSocket (= 0.60.0)
41-
- React-fishhook (0.60.0)
42-
- React-jsi (0.60.0):
37+
- React-jsinspector (= 0.60.5)
38+
- React-DevSupport (0.60.5):
39+
- React-Core (= 0.60.5)
40+
- React-RCTWebSocket (= 0.60.5)
41+
- React-jsi (0.60.5):
4342
- boost-for-react-native (= 1.63.0)
4443
- DoubleConversion
4544
- Folly (= 2018.10.22.00)
4645
- glog
47-
- React-jsi/Default (= 0.60.0)
48-
- React-jsi/Default (0.60.0):
46+
- React-jsi/Default (= 0.60.5)
47+
- React-jsi/Default (0.60.5):
4948
- boost-for-react-native (= 1.63.0)
5049
- DoubleConversion
5150
- Folly (= 2018.10.22.00)
5251
- glog
53-
- React-jsiexecutor (0.60.0):
52+
- React-jsiexecutor (0.60.5):
5453
- DoubleConversion
5554
- Folly (= 2018.10.22.00)
5655
- glog
57-
- React-cxxreact (= 0.60.0)
58-
- React-jsi (= 0.60.0)
59-
- React-jsinspector (0.60.0)
60-
- React-RCTActionSheet (0.60.0):
61-
- React-Core (= 0.60.0)
62-
- React-RCTAnimation (0.60.0):
63-
- React-Core (= 0.60.0)
64-
- React-RCTBlob (0.60.0):
65-
- React-Core (= 0.60.0)
66-
- React-RCTNetwork (= 0.60.0)
67-
- React-RCTWebSocket (= 0.60.0)
68-
- React-RCTImage (0.60.0):
69-
- React-Core (= 0.60.0)
70-
- React-RCTNetwork (= 0.60.0)
71-
- React-RCTLinking (0.60.0):
72-
- React-Core (= 0.60.0)
73-
- React-RCTNetwork (0.60.0):
74-
- React-Core (= 0.60.0)
75-
- React-RCTSettings (0.60.0):
76-
- React-Core (= 0.60.0)
77-
- React-RCTText (0.60.0):
78-
- React-Core (= 0.60.0)
79-
- React-RCTVibration (0.60.0):
80-
- React-Core (= 0.60.0)
81-
- React-RCTWebSocket (0.60.0):
82-
- React-Core (= 0.60.0)
83-
- React-fishhook (= 0.60.0)
56+
- React-cxxreact (= 0.60.5)
57+
- React-jsi (= 0.60.5)
58+
- React-jsinspector (0.60.5)
59+
- React-RCTActionSheet (0.60.5):
60+
- React-Core (= 0.60.5)
61+
- React-RCTAnimation (0.60.5):
62+
- React-Core (= 0.60.5)
63+
- React-RCTBlob (0.60.5):
64+
- React-Core (= 0.60.5)
65+
- React-RCTNetwork (= 0.60.5)
66+
- React-RCTWebSocket (= 0.60.5)
67+
- React-RCTImage (0.60.5):
68+
- React-Core (= 0.60.5)
69+
- React-RCTNetwork (= 0.60.5)
70+
- React-RCTLinking (0.60.5):
71+
- React-Core (= 0.60.5)
72+
- React-RCTNetwork (0.60.5):
73+
- React-Core (= 0.60.5)
74+
- React-RCTSettings (0.60.5):
75+
- React-Core (= 0.60.5)
76+
- React-RCTText (0.60.5):
77+
- React-Core (= 0.60.5)
78+
- React-RCTVibration (0.60.5):
79+
- React-Core (= 0.60.5)
80+
- React-RCTWebSocket (0.60.5):
81+
- React-Core (= 0.60.5)
8482
- ReactNativeBrownfield (0.0.1):
8583
- React
8684
- RNGestureHandler (1.3.0):
8785
- React
88-
- yoga (0.60.0.React)
86+
- yoga (0.60.5.React)
8987

9088
DEPENDENCIES:
9189
- DoubleConversion (from `../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
@@ -95,7 +93,6 @@ DEPENDENCIES:
9593
- React-Core (from `../../node_modules/react-native/React`)
9694
- React-cxxreact (from `../../node_modules/react-native/ReactCommon/cxxreact`)
9795
- React-DevSupport (from `../../node_modules/react-native/React`)
98-
- React-fishhook (from `../../node_modules/react-native/Libraries/fishhook`)
9996
- React-jsi (from `../../node_modules/react-native/ReactCommon/jsi`)
10097
- React-jsiexecutor (from `../../node_modules/react-native/ReactCommon/jsiexecutor`)
10198
- React-jsinspector (from `../../node_modules/react-native/ReactCommon/jsinspector`)
@@ -109,7 +106,7 @@ DEPENDENCIES:
109106
- React-RCTText (from `../../node_modules/react-native/Libraries/Text`)
110107
- React-RCTVibration (from `../../node_modules/react-native/Libraries/Vibration`)
111108
- React-RCTWebSocket (from `../../node_modules/react-native/Libraries/WebSocket`)
112-
- ReactNativeBrownfield (from `../../`)
109+
- ReactNativeBrownfield (from `../../.`)
113110
- RNGestureHandler (from `../../node_modules/react-native-gesture-handler`)
114111
- yoga (from `../../node_modules/react-native/ReactCommon/yoga`)
115112

@@ -132,8 +129,6 @@ EXTERNAL SOURCES:
132129
:path: "../../node_modules/react-native/ReactCommon/cxxreact"
133130
React-DevSupport:
134131
:path: "../../node_modules/react-native/React"
135-
React-fishhook:
136-
:path: "../../node_modules/react-native/Libraries/fishhook"
137132
React-jsi:
138133
:path: "../../node_modules/react-native/ReactCommon/jsi"
139134
React-jsiexecutor:
@@ -161,7 +156,7 @@ EXTERNAL SOURCES:
161156
React-RCTWebSocket:
162157
:path: "../../node_modules/react-native/Libraries/WebSocket"
163158
ReactNativeBrownfield:
164-
:path: "../../"
159+
:path: "../../."
165160
RNGestureHandler:
166161
:path: "../../node_modules/react-native-gesture-handler"
167162
yoga:
@@ -172,28 +167,27 @@ SPEC CHECKSUMS:
172167
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
173168
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
174169
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
175-
React: 4b3c068e793e96672dcd186a2b572fac43e4b031
176-
React-Core: 3dc86b22920597f813c62a96db3165950b64826b
177-
React-cxxreact: 0dacb291e59b81e7c3f22a2118bee853ba8a60d2
178-
React-DevSupport: 4eb4135386acd10c2586cc9c759bf96b4dac035e
179-
React-fishhook: 86ca737527bb9d860efbb943c11c729a5b69aa3d
180-
React-jsi: 8e128c4d0d8febc2977ef617d1c09bb54326069c
181-
React-jsiexecutor: 7a3554f703a58963ec80b860144ea0f0e9b910e1
182-
React-jsinspector: d4ed52225912efe0019bb7f1a225aec20f23049a
183-
React-RCTActionSheet: b27ff3cf3a68f917c46d2b94abf938b625b96570
184-
React-RCTAnimation: 9e4708e5bd65fca8285ce7c0aa076f3f4fa5c2f8
185-
React-RCTBlob: 6eafcc3a24f33785692a7be24918ade607bc8719
186-
React-RCTImage: 46b965d7225b428ea11580ead08a4318aef1d6be
187-
React-RCTLinking: d65b9f56cf0b8e171575a86764df7bb019ac28d6
188-
React-RCTNetwork: 783ee2f430740e58f724e46adc79fe7feff64202
189-
React-RCTSettings: aa28315aadfbfaf94206d865673ae509f1e97c07
190-
React-RCTText: 685fca2e13b024271048e7e247ef24476f28a41e
191-
React-RCTVibration: 4ee1cf208ab17a50fafb1c16ffe28fe594a64e4f
192-
React-RCTWebSocket: fca087d583724aa0e5fef7d911f0f2a28d0f2736
170+
React: 53c53c4d99097af47cf60594b8706b4e3321e722
171+
React-Core: ba421f6b4f4cbe2fb17c0b6fc675f87622e78a64
172+
React-cxxreact: 8384287780c4999351ad9b6e7a149d9ed10a2395
173+
React-DevSupport: 197fb409737cff2c4f9986e77c220d7452cb9f9f
174+
React-jsi: 4d8c9efb6312a9725b18d6fc818ffc103f60fec2
175+
React-jsiexecutor: 90ad2f9db09513fc763bc757fdc3c4ff8bde2a30
176+
React-jsinspector: e08662d1bf5b129a3d556eb9ea343a3f40353ae4
177+
React-RCTActionSheet: b0f1ea83f4bf75fb966eae9bfc47b78c8d3efd90
178+
React-RCTAnimation: 359ba1b5690b1e87cc173558a78e82d35919333e
179+
React-RCTBlob: 5e2b55f76e9a1c7ae52b826923502ddc3238df24
180+
React-RCTImage: f5f1c50922164e89bdda67bcd0153952a5cfe719
181+
React-RCTLinking: d0ecbd791e9ddddc41fa1f66b0255de90e8ee1e9
182+
React-RCTNetwork: e26946300b0ab7bb6c4a6348090e93fa21f33a9d
183+
React-RCTSettings: d0d37cb521b7470c998595a44f05847777cc3f42
184+
React-RCTText: b074d89033583d4f2eb5faf7ea2db3a13c7553a2
185+
React-RCTVibration: 2105b2e0e2b66a6408fc69a46c8a7fb5b2fdade0
186+
React-RCTWebSocket: cd932a16b7214898b6b7f788c8bddb3637246ac4
193187
ReactNativeBrownfield: af3caba0d9116aaec5964348258636293fa94f7c
194188
RNGestureHandler: 5329a942fce3d41c68b84c2c2276ce06a696d8b0
195-
yoga: 616fde658be980aa60a2158835170f3f9c2d04b4
189+
yoga: 312528f5bbbba37b4dcea5ef00e8b4033fdd9411
196190

197-
PODFILE CHECKSUM: ba373afec6fc96ea314dd755df3ac5ef81b30999
191+
PODFILE CHECKSUM: 541e978e6a4fefed1c7c2bea17db0e7f75ff0c68
198192

199193
COCOAPODS: 1.7.3

0 commit comments

Comments
 (0)