Selaa lähdekoodia

upgrade to RN 0.38

wusuopu 8 vuotta sitten
vanhempi
commit
6adee4f6b7

+ 5
- 4
Demo/.flowconfig Näytä tiedosto

@@ -1,7 +1,7 @@
1 1
 [ignore]
2 2
 
3 3
 # We fork some components by platform.
4
-.*/*.android.js
4
+.*/*[.]android.js
5 5
 
6 6
 # Ignore templates with `@flow` in header
7 7
 .*/local-cli/generator.*
@@ -17,6 +17,7 @@
17 17
 
18 18
 # Ignore unexpected extra @providesModule
19 19
 .*/node_modules/commoner/test/source/widget/share.js
20
+.*/node_modules/.*/node_modules/fbjs/.*
20 21
 
21 22
 # Ignore duplicate module providers
22 23
 # For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
@@ -48,11 +49,11 @@ suppress_type=$FlowIssue
48 49
 suppress_type=$FlowFixMe
49 50
 suppress_type=$FixMe
50 51
 
51
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(30\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
52
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(30\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
52
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
53
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-3]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
53 54
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
54 55
 
55 56
 unsafe.enable_getters_and_setters=true
56 57
 
57 58
 [version]
58
-^0.30.0
59
+^0.33.0

+ 1
- 1
Demo/.gitignore Näytä tiedosto

@@ -38,4 +38,4 @@ npm-debug.log
38 38
 buck-out/
39 39
 \.buckd/
40 40
 android/app/libs
41
-android/keystores/debug.keystore
41
+*.keystore

+ 2
- 2
Demo/android/app/build.gradle Näytä tiedosto

@@ -135,6 +135,6 @@ dependencies {
135 135
 // Run this once to be able to run the application with BUCK
136 136
 // puts all compile dependencies into folder libs for BUCK to use
137 137
 task copyDownloadableDepsToLibs(type: Copy) {
138
-  from configurations.compile
139
-  into 'libs'
138
+    from configurations.compile
139
+    into 'libs'
140 140
 }

+ 8
- 1
Demo/android/app/src/main/java/com/demo/MainApplication.java Näytä tiedosto

@@ -9,6 +9,7 @@ import com.facebook.react.ReactInstanceManager;
9 9
 import com.facebook.react.ReactNativeHost;
10 10
 import com.facebook.react.ReactPackage;
11 11
 import com.facebook.react.shell.MainReactPackage;
12
+import com.facebook.soloader.SoLoader;
12 13
 
13 14
 import java.util.Arrays;
14 15
 import java.util.List;
@@ -32,6 +33,12 @@ public class MainApplication extends Application implements ReactApplication {
32 33
 
33 34
   @Override
34 35
   public ReactNativeHost getReactNativeHost() {
35
-      return mReactNativeHost;
36
+    return mReactNativeHost;
37
+  }
38
+
39
+  @Override
40
+  public void onCreate() {
41
+    super.onCreate();
42
+    SoLoader.init(this, /* native exopackage */ false);
36 43
   }
37 44
 }

+ 130
- 21
Demo/ios/Demo.xcodeproj/project.pbxproj Näytä tiedosto

@@ -22,7 +22,7 @@
22 22
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
23 23
 		140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
24 24
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
25
-		80C2567579EF4FD5932F7476 /* libRNIdle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83FCC8455F1A44EFA242EBD1 /* libRNIdle.a */; };
25
+		591DE4D90E7C4FDDAD564EA0 /* libRNIdle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F93B2CFD64BA4CBAAB49E8E0 /* libRNIdle.a */; };
26 26
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
27 27
 /* End PBXBuildFile section */
28 28
 
@@ -90,9 +90,58 @@
90 90
 			remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
91 91
 			remoteInfo = React;
92 92
 		};
93
-		6FB6F1061D8CE97600D9AE37 /* PBXContainerItemProxy */ = {
93
+		6FCF12E21DE9A78D003D03A7 /* PBXContainerItemProxy */ = {
94 94
 			isa = PBXContainerItemProxy;
95
-			containerPortal = E570B8881E5D40628A764B4F /* RNIdle.xcodeproj */;
95
+			containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
96
+			proxyType = 2;
97
+			remoteGlobalIDString = 2D2A283A1D9B042B00D4039D;
98
+			remoteInfo = "RCTImage-tvOS";
99
+		};
100
+		6FCF12E61DE9A78D003D03A7 /* PBXContainerItemProxy */ = {
101
+			isa = PBXContainerItemProxy;
102
+			containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
103
+			proxyType = 2;
104
+			remoteGlobalIDString = 2D2A28471D9B043800D4039D;
105
+			remoteInfo = "RCTLinking-tvOS";
106
+		};
107
+		6FCF12EA1DE9A78D003D03A7 /* PBXContainerItemProxy */ = {
108
+			isa = PBXContainerItemProxy;
109
+			containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
110
+			proxyType = 2;
111
+			remoteGlobalIDString = 2D2A28541D9B044C00D4039D;
112
+			remoteInfo = "RCTNetwork-tvOS";
113
+		};
114
+		6FCF12EE1DE9A78D003D03A7 /* PBXContainerItemProxy */ = {
115
+			isa = PBXContainerItemProxy;
116
+			containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
117
+			proxyType = 2;
118
+			remoteGlobalIDString = 2D2A28611D9B046600D4039D;
119
+			remoteInfo = "RCTSettings-tvOS";
120
+		};
121
+		6FCF12F21DE9A78D003D03A7 /* PBXContainerItemProxy */ = {
122
+			isa = PBXContainerItemProxy;
123
+			containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
124
+			proxyType = 2;
125
+			remoteGlobalIDString = 2D2A287B1D9B048500D4039D;
126
+			remoteInfo = "RCTText-tvOS";
127
+		};
128
+		6FCF12F71DE9A78D003D03A7 /* PBXContainerItemProxy */ = {
129
+			isa = PBXContainerItemProxy;
130
+			containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
131
+			proxyType = 2;
132
+			remoteGlobalIDString = 2D2A28881D9B049200D4039D;
133
+			remoteInfo = "RCTWebSocket-tvOS";
134
+		};
135
+		6FCF12FB1DE9A78D003D03A7 /* PBXContainerItemProxy */ = {
136
+			isa = PBXContainerItemProxy;
137
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
138
+			proxyType = 2;
139
+			remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
140
+			remoteInfo = "React-tvOS";
141
+		};
142
+		6FCF12FE1DE9A78D003D03A7 /* PBXContainerItemProxy */ = {
143
+			isa = PBXContainerItemProxy;
144
+			containerPortal = 2284F3CB1D4A495FB5669E8A /* RNIdle.xcodeproj */;
96 145
 			proxyType = 2;
97 146
 			remoteGlobalIDString = 6FB6F0D91D8CE22100D9AE37;
98 147
 			remoteInfo = RNIdle;
@@ -133,10 +182,10 @@
133 182
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Demo/Info.plist; sourceTree = "<group>"; };
134 183
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Demo/main.m; sourceTree = "<group>"; };
135 184
 		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
185
+		2284F3CB1D4A495FB5669E8A /* RNIdle.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNIdle.xcodeproj; path = "../node_modules/react-native-idle/ios/RNIdle.xcodeproj"; sourceTree = "<group>"; };
136 186
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
137 187
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
138
-		83FCC8455F1A44EFA242EBD1 /* libRNIdle.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNIdle.a; sourceTree = "<group>"; };
139
-		E570B8881E5D40628A764B4F /* RNIdle.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNIdle.xcodeproj; path = "../node_modules/react-native-idle/ios/RNIdle.xcodeproj"; sourceTree = "<group>"; };
188
+		F93B2CFD64BA4CBAAB49E8E0 /* libRNIdle.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNIdle.a; sourceTree = "<group>"; };
140 189
 /* End PBXFileReference section */
141 190
 
142 191
 /* Begin PBXFrameworksBuildPhase section */
@@ -162,7 +211,7 @@
162 211
 				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
163 212
 				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
164 213
 				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
165
-				80C2567579EF4FD5932F7476 /* libRNIdle.a in Frameworks */,
214
+				591DE4D90E7C4FDDAD564EA0 /* libRNIdle.a in Frameworks */,
166 215
 			);
167 216
 			runOnlyForDeploymentPostprocessing = 0;
168 217
 		};
@@ -189,6 +238,7 @@
189 238
 			isa = PBXGroup;
190 239
 			children = (
191 240
 				00C302C01ABCB91800DB3ED1 /* libRCTImage.a */,
241
+				6FCF12E31DE9A78D003D03A7 /* libRCTImage-tvOS.a */,
192 242
 			);
193 243
 			name = Products;
194 244
 			sourceTree = "<group>";
@@ -197,6 +247,7 @@
197 247
 			isa = PBXGroup;
198 248
 			children = (
199 249
 				00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */,
250
+				6FCF12EB1DE9A78D003D03A7 /* libRCTNetwork-tvOS.a */,
200 251
 			);
201 252
 			name = Products;
202 253
 			sourceTree = "<group>";
@@ -230,6 +281,7 @@
230 281
 			isa = PBXGroup;
231 282
 			children = (
232 283
 				139105C11AF99BAD00B5F7CC /* libRCTSettings.a */,
284
+				6FCF12EF1DE9A78D003D03A7 /* libRCTSettings-tvOS.a */,
233 285
 			);
234 286
 			name = Products;
235 287
 			sourceTree = "<group>";
@@ -238,6 +290,7 @@
238 290
 			isa = PBXGroup;
239 291
 			children = (
240 292
 				139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
293
+				6FCF12F81DE9A78D003D03A7 /* libRCTWebSocket-tvOS.a */,
241 294
 			);
242 295
 			name = Products;
243 296
 			sourceTree = "<group>";
@@ -260,14 +313,15 @@
260 313
 			isa = PBXGroup;
261 314
 			children = (
262 315
 				146834041AC3E56700842450 /* libReact.a */,
316
+				6FCF12FC1DE9A78D003D03A7 /* libReact-tvOS.a */,
263 317
 			);
264 318
 			name = Products;
265 319
 			sourceTree = "<group>";
266 320
 		};
267
-		6FB6F0F91D8CE97600D9AE37 /* Products */ = {
321
+		6FCF12DC1DE9A788003D03A7 /* Products */ = {
268 322
 			isa = PBXGroup;
269 323
 			children = (
270
-				6FB6F1071D8CE97600D9AE37 /* libRNIdle.a */,
324
+				6FCF12FF1DE9A78D003D03A7 /* libRNIdle.a */,
271 325
 			);
272 326
 			name = Products;
273 327
 			sourceTree = "<group>";
@@ -276,6 +330,7 @@
276 330
 			isa = PBXGroup;
277 331
 			children = (
278 332
 				78C398B91ACF4ADC00677621 /* libRCTLinking.a */,
333
+				6FCF12E71DE9A78D003D03A7 /* libRCTLinking-tvOS.a */,
279 334
 			);
280 335
 			name = Products;
281 336
 			sourceTree = "<group>";
@@ -293,7 +348,7 @@
293 348
 				832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
294 349
 				00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
295 350
 				139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
296
-				E570B8881E5D40628A764B4F /* RNIdle.xcodeproj */,
351
+				2284F3CB1D4A495FB5669E8A /* RNIdle.xcodeproj */,
297 352
 			);
298 353
 			name = Libraries;
299 354
 			sourceTree = "<group>";
@@ -302,6 +357,7 @@
302 357
 			isa = PBXGroup;
303 358
 			children = (
304 359
 				832341B51AAA6A8300B99B32 /* libRCTText.a */,
360
+				6FCF12F31DE9A78D003D03A7 /* libRCTText-tvOS.a */,
305 361
 			);
306 362
 			name = Products;
307 363
 			sourceTree = "<group>";
@@ -434,8 +490,8 @@
434 490
 					ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
435 491
 				},
436 492
 				{
437
-					ProductGroup = 6FB6F0F91D8CE97600D9AE37 /* Products */;
438
-					ProjectRef = E570B8881E5D40628A764B4F /* RNIdle.xcodeproj */;
493
+					ProductGroup = 6FCF12DC1DE9A788003D03A7 /* Products */;
494
+					ProjectRef = 2284F3CB1D4A495FB5669E8A /* RNIdle.xcodeproj */;
439 495
 				},
440 496
 			);
441 497
 			projectRoot = "";
@@ -503,11 +559,60 @@
503 559
 			remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */;
504 560
 			sourceTree = BUILT_PRODUCTS_DIR;
505 561
 		};
506
-		6FB6F1071D8CE97600D9AE37 /* libRNIdle.a */ = {
562
+		6FCF12E31DE9A78D003D03A7 /* libRCTImage-tvOS.a */ = {
563
+			isa = PBXReferenceProxy;
564
+			fileType = archive.ar;
565
+			path = "libRCTImage-tvOS.a";
566
+			remoteRef = 6FCF12E21DE9A78D003D03A7 /* PBXContainerItemProxy */;
567
+			sourceTree = BUILT_PRODUCTS_DIR;
568
+		};
569
+		6FCF12E71DE9A78D003D03A7 /* libRCTLinking-tvOS.a */ = {
570
+			isa = PBXReferenceProxy;
571
+			fileType = archive.ar;
572
+			path = "libRCTLinking-tvOS.a";
573
+			remoteRef = 6FCF12E61DE9A78D003D03A7 /* PBXContainerItemProxy */;
574
+			sourceTree = BUILT_PRODUCTS_DIR;
575
+		};
576
+		6FCF12EB1DE9A78D003D03A7 /* libRCTNetwork-tvOS.a */ = {
577
+			isa = PBXReferenceProxy;
578
+			fileType = archive.ar;
579
+			path = "libRCTNetwork-tvOS.a";
580
+			remoteRef = 6FCF12EA1DE9A78D003D03A7 /* PBXContainerItemProxy */;
581
+			sourceTree = BUILT_PRODUCTS_DIR;
582
+		};
583
+		6FCF12EF1DE9A78D003D03A7 /* libRCTSettings-tvOS.a */ = {
584
+			isa = PBXReferenceProxy;
585
+			fileType = archive.ar;
586
+			path = "libRCTSettings-tvOS.a";
587
+			remoteRef = 6FCF12EE1DE9A78D003D03A7 /* PBXContainerItemProxy */;
588
+			sourceTree = BUILT_PRODUCTS_DIR;
589
+		};
590
+		6FCF12F31DE9A78D003D03A7 /* libRCTText-tvOS.a */ = {
591
+			isa = PBXReferenceProxy;
592
+			fileType = archive.ar;
593
+			path = "libRCTText-tvOS.a";
594
+			remoteRef = 6FCF12F21DE9A78D003D03A7 /* PBXContainerItemProxy */;
595
+			sourceTree = BUILT_PRODUCTS_DIR;
596
+		};
597
+		6FCF12F81DE9A78D003D03A7 /* libRCTWebSocket-tvOS.a */ = {
598
+			isa = PBXReferenceProxy;
599
+			fileType = archive.ar;
600
+			path = "libRCTWebSocket-tvOS.a";
601
+			remoteRef = 6FCF12F71DE9A78D003D03A7 /* PBXContainerItemProxy */;
602
+			sourceTree = BUILT_PRODUCTS_DIR;
603
+		};
604
+		6FCF12FC1DE9A78D003D03A7 /* libReact-tvOS.a */ = {
605
+			isa = PBXReferenceProxy;
606
+			fileType = archive.ar;
607
+			path = "libReact-tvOS.a";
608
+			remoteRef = 6FCF12FB1DE9A78D003D03A7 /* PBXContainerItemProxy */;
609
+			sourceTree = BUILT_PRODUCTS_DIR;
610
+		};
611
+		6FCF12FF1DE9A78D003D03A7 /* libRNIdle.a */ = {
507 612
 			isa = PBXReferenceProxy;
508 613
 			fileType = archive.ar;
509 614
 			path = libRNIdle.a;
510
-			remoteRef = 6FB6F1061D8CE97600D9AE37 /* PBXContainerItemProxy */;
615
+			remoteRef = 6FCF12FE1DE9A78D003D03A7 /* PBXContainerItemProxy */;
511 616
 			sourceTree = BUILT_PRODUCTS_DIR;
512 617
 		};
513 618
 		78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = {
@@ -612,7 +717,7 @@
612 717
 					"$(inherited)",
613 718
 				);
614 719
 				INFOPLIST_FILE = DemoTests/Info.plist;
615
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
720
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
616 721
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
617 722
 				LIBRARY_SEARCH_PATHS = (
618 723
 					"$(inherited)",
@@ -629,7 +734,7 @@
629 734
 				BUNDLE_LOADER = "$(TEST_HOST)";
630 735
 				COPY_PHASE_STRIP = NO;
631 736
 				INFOPLIST_FILE = DemoTests/Info.plist;
632
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
737
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
633 738
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
634 739
 				LIBRARY_SEARCH_PATHS = (
635 740
 					"$(inherited)",
@@ -644,12 +749,13 @@
644 749
 			isa = XCBuildConfiguration;
645 750
 			buildSettings = {
646 751
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
752
+				CURRENT_PROJECT_VERSION = 1;
647 753
 				DEAD_CODE_STRIPPING = NO;
648 754
 				HEADER_SEARCH_PATHS = (
649 755
 					"$(inherited)",
650 756
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
651 757
 					"$(SRCROOT)/../node_modules/react-native/React/**",
652
-					"$(SRCROOT)/../node_modules/react-native-idle/ios/RNIdle/**",
758
+					"$(SRCROOT)/../node_modules/react-native-idle/ios/RNIdle",
653 759
 				);
654 760
 				INFOPLIST_FILE = Demo/Info.plist;
655 761
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -659,6 +765,7 @@
659 765
 					"-lc++",
660 766
 				);
661 767
 				PRODUCT_NAME = Demo;
768
+				VERSIONING_SYSTEM = "apple-generic";
662 769
 			};
663 770
 			name = Debug;
664 771
 		};
@@ -666,11 +773,12 @@
666 773
 			isa = XCBuildConfiguration;
667 774
 			buildSettings = {
668 775
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
776
+				CURRENT_PROJECT_VERSION = 1;
669 777
 				HEADER_SEARCH_PATHS = (
670 778
 					"$(inherited)",
671 779
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
672 780
 					"$(SRCROOT)/../node_modules/react-native/React/**",
673
-					"$(SRCROOT)/../node_modules/react-native-idle/ios/RNIdle/**",
781
+					"$(SRCROOT)/../node_modules/react-native-idle/ios/RNIdle",
674 782
 				);
675 783
 				INFOPLIST_FILE = Demo/Info.plist;
676 784
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -680,6 +788,7 @@
680 788
 					"-lc++",
681 789
 				);
682 790
 				PRODUCT_NAME = Demo;
791
+				VERSIONING_SYSTEM = "apple-generic";
683 792
 			};
684 793
 			name = Release;
685 794
 		};
@@ -721,9 +830,9 @@
721 830
 					"$(inherited)",
722 831
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
723 832
 					"$(SRCROOT)/../node_modules/react-native/React/**",
724
-					"$(SRCROOT)/../node_modules/react-native-idle/ios/RNIdle/**",
833
+					"$(SRCROOT)/../node_modules/react-native-idle/ios/RNIdle",
725 834
 				);
726
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
835
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
727 836
 				MTL_ENABLE_DEBUG_INFO = YES;
728 837
 				ONLY_ACTIVE_ARCH = YES;
729 838
 				SDKROOT = iphoneos;
@@ -762,9 +871,9 @@
762 871
 					"$(inherited)",
763 872
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
764 873
 					"$(SRCROOT)/../node_modules/react-native/React/**",
765
-					"$(SRCROOT)/../node_modules/react-native-idle/ios/RNIdle/**",
874
+					"$(SRCROOT)/../node_modules/react-native-idle/ios/RNIdle",
766 875
 				);
767
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
876
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
768 877
 				MTL_ENABLE_DEBUG_INFO = NO;
769 878
 				SDKROOT = iphoneos;
770 879
 				VALIDATE_PRODUCT = YES;

+ 1
- 1
Demo/ios/Demo/Info.plist Näytä tiedosto

@@ -45,7 +45,7 @@
45 45
 		<dict>
46 46
 			<key>localhost</key>
47 47
 			<dict>
48
-				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
48
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
49 49
 				<true/>
50 50
 			</dict>
51 51
 		</dict>

+ 1
- 1
Demo/package.json Näytä tiedosto

@@ -7,7 +7,7 @@
7 7
   },
8 8
   "dependencies": {
9 9
     "react": "15.3.1",
10
-    "react-native": "^0.33.0",
10
+    "react-native": "^0.38.0",
11 11
     "react-native-idle": "file:../"
12 12
   }
13 13
 }