Sfoglia il codice sorgente

upgrade rn version to 0.59.2 for demo

iou90 5 anni fa
parent
commit
b3986738e1

+ 1
- 1
demo/android/build.gradle Vedi File

@@ -13,7 +13,7 @@ buildscript {
13 13
         jcenter()
14 14
     }
15 15
     dependencies {
16
-        classpath 'com.android.tools.build:gradle:3.2.1'
16
+        classpath 'com.android.tools.build:gradle:3.3.0'
17 17
 
18 18
         // NOTE: Do not place your application dependencies here; they belong
19 19
         // in the individual module build.gradle files

+ 1
- 1
demo/android/gradle.properties Vedi File

@@ -15,4 +15,4 @@
15 15
 # When configured, Gradle will run in incubating parallel mode.
16 16
 # This option should only be used with decoupled projects. More details, visit
17 17
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18
-# org.gradle.parallel=true
18
+# org.gradle.parallel=true

+ 1
- 1
demo/android/gradle/wrapper/gradle-wrapper.properties Vedi File

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
2 2
 distributionPath=wrapper/dists
3 3
 zipStoreBase=GRADLE_USER_HOME
4 4
 zipStorePath=wrapper/dists
5
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
5
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

+ 223
- 105
demo/ios/demo.xcodeproj/project.pbxproj Vedi File

@@ -5,6 +5,7 @@
5 5
 	};
6 6
 	objectVersion = 46;
7 7
 	objects = {
8
+
8 9
 /* Begin PBXBuildFile section */
9 10
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
10 11
 		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -36,10 +37,10 @@
36 37
 		2DCD954D1E0B4F2C00145EB5 /* demoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* demoTests.m */; };
37 38
 		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
38 39
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
40
+		9C2714579B5B4B3AB47C8102 /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6726F4BEFBE141BA88B18DAC /* libRNCWebView.a */; };
39 41
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
40 42
 		ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
41 43
 		ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; };
42
-		67358EEE45004F09A283C3E3 /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F571B03CD384ED4A5C07A73 /* libRNCWebView.a */; };
43 44
 /* End PBXBuildFile section */
44 45
 
45 46
 /* Begin PBXContainerItemProxy section */
@@ -176,19 +177,68 @@
176 177
 			remoteGlobalIDString = 3D383D621EBD27B9005632C8;
177 178
 			remoteInfo = "double-conversion-tvOS";
178 179
 		};
179
-		2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */ = {
180
+		374211412251CFA1002B9A7F /* PBXContainerItemProxy */ = {
180 181
 			isa = PBXContainerItemProxy;
181 182
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
182 183
 			proxyType = 2;
183
-			remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
184
-			remoteInfo = privatedata;
184
+			remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8;
185
+			remoteInfo = jsi;
185 186
 		};
186
-		2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */ = {
187
+		374211432251CFA1002B9A7F /* PBXContainerItemProxy */ = {
187 188
 			isa = PBXContainerItemProxy;
188 189
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
189 190
 			proxyType = 2;
190
-			remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
191
-			remoteInfo = "privatedata-tvOS";
191
+			remoteGlobalIDString = EDEBC73B214B45A300DD5AC8;
192
+			remoteInfo = jsiexecutor;
193
+		};
194
+		374211452251CFA1002B9A7F /* PBXContainerItemProxy */ = {
195
+			isa = PBXContainerItemProxy;
196
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
197
+			proxyType = 2;
198
+			remoteGlobalIDString = ED296FB6214C9A0900B7C4FE;
199
+			remoteInfo = "jsi-tvOS";
200
+		};
201
+		374211472251CFA1002B9A7F /* PBXContainerItemProxy */ = {
202
+			isa = PBXContainerItemProxy;
203
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
204
+			proxyType = 2;
205
+			remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
206
+			remoteInfo = "jsiexecutor-tvOS";
207
+		};
208
+		3742114A2251CFA1002B9A7F /* PBXContainerItemProxy */ = {
209
+			isa = PBXContainerItemProxy;
210
+			containerPortal = A211F7DA84AC451EB6AE45FE /* RNCWebView.xcodeproj */;
211
+			proxyType = 2;
212
+			remoteGlobalIDString = 134814201AA4EA6300B7C361;
213
+			remoteInfo = RNCWebView;
214
+		};
215
+		3742116C2251E4D9002B9A7F /* PBXContainerItemProxy */ = {
216
+			isa = PBXContainerItemProxy;
217
+			containerPortal = 5DB9EFF16FA5469AB4FDFF96 /* demo.xcodeproj */;
218
+			proxyType = 2;
219
+			remoteGlobalIDString = 13B07F961A680F5B00A75B9A;
220
+			remoteInfo = demo;
221
+		};
222
+		3742116E2251E4D9002B9A7F /* PBXContainerItemProxy */ = {
223
+			isa = PBXContainerItemProxy;
224
+			containerPortal = 5DB9EFF16FA5469AB4FDFF96 /* demo.xcodeproj */;
225
+			proxyType = 2;
226
+			remoteGlobalIDString = 00E356EE1AD99517003FC87E;
227
+			remoteInfo = demoTests;
228
+		};
229
+		374211702251E4D9002B9A7F /* PBXContainerItemProxy */ = {
230
+			isa = PBXContainerItemProxy;
231
+			containerPortal = 5DB9EFF16FA5469AB4FDFF96 /* demo.xcodeproj */;
232
+			proxyType = 2;
233
+			remoteGlobalIDString = 2D02E47B1E0B4A5D006451C7;
234
+			remoteInfo = "demo-tvOS";
235
+		};
236
+		374211722251E4D9002B9A7F /* PBXContainerItemProxy */ = {
237
+			isa = PBXContainerItemProxy;
238
+			containerPortal = 5DB9EFF16FA5469AB4FDFF96 /* demo.xcodeproj */;
239
+			proxyType = 2;
240
+			remoteGlobalIDString = 2D02E4901E0B4A5D006451C7;
241
+			remoteInfo = "demo-tvOSTests";
192 242
 		};
193 243
 		3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
194 244
 			isa = PBXContainerItemProxy;
@@ -267,20 +317,6 @@
267 317
 			remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
268 318
 			remoteInfo = "cxxreact-tvOS";
269 319
 		};
270
-		3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
271
-			isa = PBXContainerItemProxy;
272
-			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
273
-			proxyType = 2;
274
-			remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
275
-			remoteInfo = jschelpers;
276
-		};
277
-		3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
278
-			isa = PBXContainerItemProxy;
279
-			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
280
-			proxyType = 2;
281
-			remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
282
-			remoteInfo = "jschelpers-tvOS";
283
-		};
284 320
 		5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = {
285 321
 			isa = PBXContainerItemProxy;
286 322
 			containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
@@ -341,14 +377,15 @@
341 377
 		2D02E47B1E0B4A5D006451C7 /* demo-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "demo-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
342 378
 		2D02E4901E0B4A5D006451C7 /* demo-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "demo-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
343 379
 		2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
380
+		5DB9EFF16FA5469AB4FDFF96 /* demo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = demo.xcodeproj; path = "../node_modules/react-native-autoheight-webview/demo/ios/demo.xcodeproj"; sourceTree = "<group>"; };
344 381
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
382
+		6726F4BEFBE141BA88B18DAC /* libRNCWebView.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCWebView.a; sourceTree = "<group>"; };
345 383
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
346 384
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
385
+		A211F7DA84AC451EB6AE45FE /* RNCWebView.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCWebView.xcodeproj; path = "../node_modules/react-native-webview/ios/RNCWebView.xcodeproj"; sourceTree = "<group>"; };
347 386
 		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
348 387
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
349 388
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
350
-		97C8BA14ABDD4368BA605616 /* RNCWebView.xcodeproj */ = {isa = PBXFileReference; name = "RNCWebView.xcodeproj"; path = "../node_modules/react-native-webview/ios/RNCWebView.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
351
-		9F571B03CD384ED4A5C07A73 /* libRNCWebView.a */ = {isa = PBXFileReference; name = "libRNCWebView.a"; path = "libRNCWebView.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
352 389
 /* End PBXFileReference section */
353 390
 
354 391
 /* Begin PBXFrameworksBuildPhase section */
@@ -377,7 +414,7 @@
377 414
 				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
378 415
 				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
379 416
 				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
380
-				67358EEE45004F09A283C3E3 /* libRNCWebView.a in Frameworks */,
417
+				9C2714579B5B4B3AB47C8102 /* libRNCWebView.a in Frameworks */,
381 418
 			);
382 419
 			runOnlyForDeploymentPostprocessing = 0;
383 420
 		};
@@ -510,16 +547,16 @@
510 547
 				3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
511 548
 				3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
512 549
 				3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
513
-				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
514
-				3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
515 550
 				2DF0FFDF2056DD460020B375 /* libjsinspector.a */,
516 551
 				2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */,
517 552
 				2DF0FFE32056DD460020B375 /* libthird-party.a */,
518 553
 				2DF0FFE52056DD460020B375 /* libthird-party.a */,
519 554
 				2DF0FFE72056DD460020B375 /* libdouble-conversion.a */,
520 555
 				2DF0FFE92056DD460020B375 /* libdouble-conversion.a */,
521
-				2DF0FFEB2056DD460020B375 /* libprivatedata.a */,
522
-				2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */,
556
+				374211422251CFA1002B9A7F /* libjsi.a */,
557
+				374211442251CFA1002B9A7F /* libjsiexecutor.a */,
558
+				374211462251CFA1002B9A7F /* libjsi-tvOS.a */,
559
+				374211482251CFA1002B9A7F /* libjsiexecutor-tvOS.a */,
523 560
 			);
524 561
 			name = Products;
525 562
 			sourceTree = "<group>";
@@ -534,6 +571,33 @@
534 571
 			name = Frameworks;
535 572
 			sourceTree = "<group>";
536 573
 		};
574
+		374211192251CFA0002B9A7F /* Recovered References */ = {
575
+			isa = PBXGroup;
576
+			children = (
577
+				6726F4BEFBE141BA88B18DAC /* libRNCWebView.a */,
578
+			);
579
+			name = "Recovered References";
580
+			sourceTree = "<group>";
581
+		};
582
+		3742111A2251CFA1002B9A7F /* Products */ = {
583
+			isa = PBXGroup;
584
+			children = (
585
+				3742114B2251CFA1002B9A7F /* libRNCWebView.a */,
586
+			);
587
+			name = Products;
588
+			sourceTree = "<group>";
589
+		};
590
+		374211662251E4D9002B9A7F /* Products */ = {
591
+			isa = PBXGroup;
592
+			children = (
593
+				3742116D2251E4D9002B9A7F /* demo.app */,
594
+				3742116F2251E4D9002B9A7F /* demoTests.xctest */,
595
+				374211712251E4D9002B9A7F /* demo-tvOS.app */,
596
+				374211732251E4D9002B9A7F /* demo-tvOSTests.xctest */,
597
+			);
598
+			name = Products;
599
+			sourceTree = "<group>";
600
+		};
537 601
 		5E91572E1DD0AC6500FF2AA8 /* Products */ = {
538 602
 			isa = PBXGroup;
539 603
 			children = (
@@ -567,7 +631,8 @@
567 631
 				832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
568 632
 				00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
569 633
 				139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
570
-				97C8BA14ABDD4368BA605616 /* RNCWebView.xcodeproj */,
634
+				A211F7DA84AC451EB6AE45FE /* RNCWebView.xcodeproj */,
635
+				5DB9EFF16FA5469AB4FDFF96 /* demo.xcodeproj */,
571 636
 			);
572 637
 			name = Libraries;
573 638
 			sourceTree = "<group>";
@@ -589,6 +654,7 @@
589 654
 				00E356EF1AD99517003FC87E /* demoTests */,
590 655
 				83CBBA001A601CBA00E9B192 /* Products */,
591 656
 				2D16E6871FA4F8E400B85C8A /* Frameworks */,
657
+				374211192251CFA0002B9A7F /* Recovered References */,
592 658
 			);
593 659
 			indentWidth = 2;
594 660
 			sourceTree = "<group>";
@@ -719,6 +785,7 @@
719 785
 			developmentRegion = English;
720 786
 			hasScannedForEncodings = 0;
721 787
 			knownRegions = (
788
+				English,
722 789
 				en,
723 790
 				Base,
724 791
 			);
@@ -726,6 +793,10 @@
726 793
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
727 794
 			projectDirPath = "";
728 795
 			projectReferences = (
796
+				{
797
+					ProductGroup = 374211662251E4D9002B9A7F /* Products */;
798
+					ProjectRef = 5DB9EFF16FA5469AB4FDFF96 /* demo.xcodeproj */;
799
+				},
729 800
 				{
730 801
 					ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
731 802
 					ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@@ -774,6 +845,10 @@
774 845
 					ProductGroup = 146834001AC3E56700842450 /* Products */;
775 846
 					ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
776 847
 				},
848
+				{
849
+					ProductGroup = 3742111A2251CFA1002B9A7F /* Products */;
850
+					ProjectRef = A211F7DA84AC451EB6AE45FE /* RNCWebView.xcodeproj */;
851
+				},
777 852
 			);
778 853
 			projectRoot = "";
779 854
 			targets = (
@@ -905,18 +980,67 @@
905 980
 			remoteRef = 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */;
906 981
 			sourceTree = BUILT_PRODUCTS_DIR;
907 982
 		};
908
-		2DF0FFEB2056DD460020B375 /* libprivatedata.a */ = {
983
+		374211422251CFA1002B9A7F /* libjsi.a */ = {
909 984
 			isa = PBXReferenceProxy;
910 985
 			fileType = archive.ar;
911
-			path = libprivatedata.a;
912
-			remoteRef = 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */;
986
+			path = libjsi.a;
987
+			remoteRef = 374211412251CFA1002B9A7F /* PBXContainerItemProxy */;
913 988
 			sourceTree = BUILT_PRODUCTS_DIR;
914 989
 		};
915
-		2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */ = {
990
+		374211442251CFA1002B9A7F /* libjsiexecutor.a */ = {
916 991
 			isa = PBXReferenceProxy;
917 992
 			fileType = archive.ar;
918
-			path = "libprivatedata-tvOS.a";
919
-			remoteRef = 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */;
993
+			path = libjsiexecutor.a;
994
+			remoteRef = 374211432251CFA1002B9A7F /* PBXContainerItemProxy */;
995
+			sourceTree = BUILT_PRODUCTS_DIR;
996
+		};
997
+		374211462251CFA1002B9A7F /* libjsi-tvOS.a */ = {
998
+			isa = PBXReferenceProxy;
999
+			fileType = archive.ar;
1000
+			path = "libjsi-tvOS.a";
1001
+			remoteRef = 374211452251CFA1002B9A7F /* PBXContainerItemProxy */;
1002
+			sourceTree = BUILT_PRODUCTS_DIR;
1003
+		};
1004
+		374211482251CFA1002B9A7F /* libjsiexecutor-tvOS.a */ = {
1005
+			isa = PBXReferenceProxy;
1006
+			fileType = archive.ar;
1007
+			path = "libjsiexecutor-tvOS.a";
1008
+			remoteRef = 374211472251CFA1002B9A7F /* PBXContainerItemProxy */;
1009
+			sourceTree = BUILT_PRODUCTS_DIR;
1010
+		};
1011
+		3742114B2251CFA1002B9A7F /* libRNCWebView.a */ = {
1012
+			isa = PBXReferenceProxy;
1013
+			fileType = archive.ar;
1014
+			path = libRNCWebView.a;
1015
+			remoteRef = 3742114A2251CFA1002B9A7F /* PBXContainerItemProxy */;
1016
+			sourceTree = BUILT_PRODUCTS_DIR;
1017
+		};
1018
+		3742116D2251E4D9002B9A7F /* demo.app */ = {
1019
+			isa = PBXReferenceProxy;
1020
+			fileType = wrapper.application;
1021
+			path = demo.app;
1022
+			remoteRef = 3742116C2251E4D9002B9A7F /* PBXContainerItemProxy */;
1023
+			sourceTree = BUILT_PRODUCTS_DIR;
1024
+		};
1025
+		3742116F2251E4D9002B9A7F /* demoTests.xctest */ = {
1026
+			isa = PBXReferenceProxy;
1027
+			fileType = wrapper.cfbundle;
1028
+			path = demoTests.xctest;
1029
+			remoteRef = 3742116E2251E4D9002B9A7F /* PBXContainerItemProxy */;
1030
+			sourceTree = BUILT_PRODUCTS_DIR;
1031
+		};
1032
+		374211712251E4D9002B9A7F /* demo-tvOS.app */ = {
1033
+			isa = PBXReferenceProxy;
1034
+			fileType = wrapper.application;
1035
+			path = "demo-tvOS.app";
1036
+			remoteRef = 374211702251E4D9002B9A7F /* PBXContainerItemProxy */;
1037
+			sourceTree = BUILT_PRODUCTS_DIR;
1038
+		};
1039
+		374211732251E4D9002B9A7F /* demo-tvOSTests.xctest */ = {
1040
+			isa = PBXReferenceProxy;
1041
+			fileType = wrapper.cfbundle;
1042
+			path = "demo-tvOSTests.xctest";
1043
+			remoteRef = 374211722251E4D9002B9A7F /* PBXContainerItemProxy */;
920 1044
 			sourceTree = BUILT_PRODUCTS_DIR;
921 1045
 		};
922 1046
 		3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
@@ -996,20 +1120,6 @@
996 1120
 			remoteRef = 3DAD3EAA1DF850E9000B6D8A /* PBXContainerItemProxy */;
997 1121
 			sourceTree = BUILT_PRODUCTS_DIR;
998 1122
 		};
999
-		3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */ = {
1000
-			isa = PBXReferenceProxy;
1001
-			fileType = archive.ar;
1002
-			path = libjschelpers.a;
1003
-			remoteRef = 3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */;
1004
-			sourceTree = BUILT_PRODUCTS_DIR;
1005
-		};
1006
-		3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */ = {
1007
-			isa = PBXReferenceProxy;
1008
-			fileType = archive.ar;
1009
-			path = libjschelpers.a;
1010
-			remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */;
1011
-			sourceTree = BUILT_PRODUCTS_DIR;
1012
-		};
1013 1123
 		5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
1014 1124
 			isa = PBXReferenceProxy;
1015 1125
 			fileType = archive.ar;
@@ -1183,9 +1293,18 @@
1183 1293
 					"DEBUG=1",
1184 1294
 					"$(inherited)",
1185 1295
 				);
1296
+				HEADER_SEARCH_PATHS = (
1297
+					"$(inherited)",
1298
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1299
+					"$(SRCROOT)/../node_modules/react-native-autoheight-webview/demo/node_modules/**",
1300
+				);
1186 1301
 				INFOPLIST_FILE = demoTests/Info.plist;
1187 1302
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1188 1303
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1304
+				LIBRARY_SEARCH_PATHS = (
1305
+					"$(inherited)",
1306
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1307
+				);
1189 1308
 				OTHER_LDFLAGS = (
1190 1309
 					"-ObjC",
1191 1310
 					"-lc++",
@@ -1193,14 +1312,6 @@
1193 1312
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
1194 1313
 				PRODUCT_NAME = "$(TARGET_NAME)";
1195 1314
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/demo.app/demo";
1196
-				LIBRARY_SEARCH_PATHS = (
1197
-					"$(inherited)",
1198
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1199
-				);
1200
-				HEADER_SEARCH_PATHS = (
1201
-					"$(inherited)",
1202
-					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1203
-				);
1204 1315
 			};
1205 1316
 			name = Debug;
1206 1317
 		};
@@ -1209,9 +1320,18 @@
1209 1320
 			buildSettings = {
1210 1321
 				BUNDLE_LOADER = "$(TEST_HOST)";
1211 1322
 				COPY_PHASE_STRIP = NO;
1323
+				HEADER_SEARCH_PATHS = (
1324
+					"$(inherited)",
1325
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1326
+					"$(SRCROOT)/../node_modules/react-native-autoheight-webview/demo/node_modules/**",
1327
+				);
1212 1328
 				INFOPLIST_FILE = demoTests/Info.plist;
1213 1329
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1214 1330
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1331
+				LIBRARY_SEARCH_PATHS = (
1332
+					"$(inherited)",
1333
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1334
+				);
1215 1335
 				OTHER_LDFLAGS = (
1216 1336
 					"-ObjC",
1217 1337
 					"-lc++",
@@ -1219,14 +1339,6 @@
1219 1339
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
1220 1340
 				PRODUCT_NAME = "$(TARGET_NAME)";
1221 1341
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/demo.app/demo";
1222
-				LIBRARY_SEARCH_PATHS = (
1223
-					"$(inherited)",
1224
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1225
-				);
1226
-				HEADER_SEARCH_PATHS = (
1227
-					"$(inherited)",
1228
-					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1229
-				);
1230 1342
 			};
1231 1343
 			name = Release;
1232 1344
 		};
@@ -1236,6 +1348,11 @@
1236 1348
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1237 1349
 				CURRENT_PROJECT_VERSION = 1;
1238 1350
 				DEAD_CODE_STRIPPING = NO;
1351
+				HEADER_SEARCH_PATHS = (
1352
+					"$(inherited)",
1353
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1354
+					"$(SRCROOT)/../node_modules/react-native-autoheight-webview/demo/node_modules/**",
1355
+				);
1239 1356
 				INFOPLIST_FILE = demo/Info.plist;
1240 1357
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1241 1358
 				OTHER_LDFLAGS = (
@@ -1246,10 +1363,6 @@
1246 1363
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
1247 1364
 				PRODUCT_NAME = demo;
1248 1365
 				VERSIONING_SYSTEM = "apple-generic";
1249
-				HEADER_SEARCH_PATHS = (
1250
-					"$(inherited)",
1251
-					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1252
-				);
1253 1366
 			};
1254 1367
 			name = Debug;
1255 1368
 		};
@@ -1258,6 +1371,11 @@
1258 1371
 			buildSettings = {
1259 1372
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1260 1373
 				CURRENT_PROJECT_VERSION = 1;
1374
+				HEADER_SEARCH_PATHS = (
1375
+					"$(inherited)",
1376
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1377
+					"$(SRCROOT)/../node_modules/react-native-autoheight-webview/demo/node_modules/**",
1378
+				);
1261 1379
 				INFOPLIST_FILE = demo/Info.plist;
1262 1380
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1263 1381
 				OTHER_LDFLAGS = (
@@ -1268,10 +1386,6 @@
1268 1386
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
1269 1387
 				PRODUCT_NAME = demo;
1270 1388
 				VERSIONING_SYSTEM = "apple-generic";
1271
-				HEADER_SEARCH_PATHS = (
1272
-					"$(inherited)",
1273
-					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1274
-				);
1275 1389
 			};
1276 1390
 			name = Release;
1277 1391
 		};
@@ -1287,8 +1401,17 @@
1287 1401
 				DEBUG_INFORMATION_FORMAT = dwarf;
1288 1402
 				ENABLE_TESTABILITY = YES;
1289 1403
 				GCC_NO_COMMON_BLOCKS = YES;
1404
+				HEADER_SEARCH_PATHS = (
1405
+					"$(inherited)",
1406
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1407
+					"$(SRCROOT)/../node_modules/react-native-autoheight-webview/demo/node_modules/**",
1408
+				);
1290 1409
 				INFOPLIST_FILE = "demo-tvOS/Info.plist";
1291 1410
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1411
+				LIBRARY_SEARCH_PATHS = (
1412
+					"$(inherited)",
1413
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1414
+				);
1292 1415
 				OTHER_LDFLAGS = (
1293 1416
 					"-ObjC",
1294 1417
 					"-lc++",
@@ -1298,14 +1421,6 @@
1298 1421
 				SDKROOT = appletvos;
1299 1422
 				TARGETED_DEVICE_FAMILY = 3;
1300 1423
 				TVOS_DEPLOYMENT_TARGET = 9.2;
1301
-				LIBRARY_SEARCH_PATHS = (
1302
-					"$(inherited)",
1303
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1304
-				);
1305
-				HEADER_SEARCH_PATHS = (
1306
-					"$(inherited)",
1307
-					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1308
-				);
1309 1424
 			};
1310 1425
 			name = Debug;
1311 1426
 		};
@@ -1321,8 +1436,17 @@
1321 1436
 				COPY_PHASE_STRIP = NO;
1322 1437
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1323 1438
 				GCC_NO_COMMON_BLOCKS = YES;
1439
+				HEADER_SEARCH_PATHS = (
1440
+					"$(inherited)",
1441
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1442
+					"$(SRCROOT)/../node_modules/react-native-autoheight-webview/demo/node_modules/**",
1443
+				);
1324 1444
 				INFOPLIST_FILE = "demo-tvOS/Info.plist";
1325 1445
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1446
+				LIBRARY_SEARCH_PATHS = (
1447
+					"$(inherited)",
1448
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1449
+				);
1326 1450
 				OTHER_LDFLAGS = (
1327 1451
 					"-ObjC",
1328 1452
 					"-lc++",
@@ -1332,14 +1456,6 @@
1332 1456
 				SDKROOT = appletvos;
1333 1457
 				TARGETED_DEVICE_FAMILY = 3;
1334 1458
 				TVOS_DEPLOYMENT_TARGET = 9.2;
1335
-				LIBRARY_SEARCH_PATHS = (
1336
-					"$(inherited)",
1337
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1338
-				);
1339
-				HEADER_SEARCH_PATHS = (
1340
-					"$(inherited)",
1341
-					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1342
-				);
1343 1459
 			};
1344 1460
 			name = Release;
1345 1461
 		};
@@ -1354,8 +1470,17 @@
1354 1470
 				DEBUG_INFORMATION_FORMAT = dwarf;
1355 1471
 				ENABLE_TESTABILITY = YES;
1356 1472
 				GCC_NO_COMMON_BLOCKS = YES;
1473
+				HEADER_SEARCH_PATHS = (
1474
+					"$(inherited)",
1475
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1476
+					"$(SRCROOT)/../node_modules/react-native-autoheight-webview/demo/node_modules/**",
1477
+				);
1357 1478
 				INFOPLIST_FILE = "demo-tvOSTests/Info.plist";
1358 1479
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1480
+				LIBRARY_SEARCH_PATHS = (
1481
+					"$(inherited)",
1482
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1483
+				);
1359 1484
 				OTHER_LDFLAGS = (
1360 1485
 					"-ObjC",
1361 1486
 					"-lc++",
@@ -1365,14 +1490,6 @@
1365 1490
 				SDKROOT = appletvos;
1366 1491
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/demo-tvOS.app/demo-tvOS";
1367 1492
 				TVOS_DEPLOYMENT_TARGET = 10.1;
1368
-				LIBRARY_SEARCH_PATHS = (
1369
-					"$(inherited)",
1370
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1371
-				);
1372
-				HEADER_SEARCH_PATHS = (
1373
-					"$(inherited)",
1374
-					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1375
-				);
1376 1493
 			};
1377 1494
 			name = Debug;
1378 1495
 		};
@@ -1387,8 +1504,17 @@
1387 1504
 				COPY_PHASE_STRIP = NO;
1388 1505
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1389 1506
 				GCC_NO_COMMON_BLOCKS = YES;
1507
+				HEADER_SEARCH_PATHS = (
1508
+					"$(inherited)",
1509
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1510
+					"$(SRCROOT)/../node_modules/react-native-autoheight-webview/demo/node_modules/**",
1511
+				);
1390 1512
 				INFOPLIST_FILE = "demo-tvOSTests/Info.plist";
1391 1513
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1514
+				LIBRARY_SEARCH_PATHS = (
1515
+					"$(inherited)",
1516
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1517
+				);
1392 1518
 				OTHER_LDFLAGS = (
1393 1519
 					"-ObjC",
1394 1520
 					"-lc++",
@@ -1398,14 +1524,6 @@
1398 1524
 				SDKROOT = appletvos;
1399 1525
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/demo-tvOS.app/demo-tvOS";
1400 1526
 				TVOS_DEPLOYMENT_TARGET = 10.1;
1401
-				LIBRARY_SEARCH_PATHS = (
1402
-					"$(inherited)",
1403
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1404
-				);
1405
-				HEADER_SEARCH_PATHS = (
1406
-					"$(inherited)",
1407
-					"$(SRCROOT)/../node_modules/react-native-webview/ios",
1408
-				);
1409 1527
 			};
1410 1528
 			name = Release;
1411 1529
 		};

+ 10
- 0
demo/metro.config.js Vedi File

@@ -0,0 +1,10 @@
1
+module.exports = {
2
+    transformer: {
3
+      getTransformOptions: async () => ({
4
+        transform: {
5
+          experimentalImportSupport: false,
6
+          inlineRequires: false,
7
+        },
8
+      }),
9
+    },
10
+  };

+ 6
- 12
demo/package.json Vedi File

@@ -3,23 +3,17 @@
3 3
   "version": "0.0.1",
4 4
   "private": true,
5 5
   "scripts": {
6
-    "start": "node node_modules/react-native/local-cli/cli.js start",
7
-    "test": "jest"
6
+    "start": "node node_modules/react-native/local-cli/cli.js start"
8 7
   },
9 8
   "dependencies": {
10
-    "react": "16.6.3",
11
-    "react-native": "0.58.5",
9
+    "react": "16.8.3",
10
+    "react-native": "0.59.2",
12 11
     "react-native-autoheight-webview": "../",
13
-    "react-native-webview": "^5.2.1"
12
+    "react-native-webview": "^5.5.0"
14 13
   },
15 14
   "devDependencies": {
16
-    "babel-core": "^7.0.0-bridge.0",
17
-    "babel-jest": "24.0.0",
18
-    "jest": "24.0.0",
15
+    "@babel/core": "^7.0.0",
19 16
     "metro-react-native-babel-preset": "0.51.1",
20
-    "react-test-renderer": "16.6.3"
21
-  },
22
-  "jest": {
23
-    "preset": "react-native"
17
+    "react-test-renderer": "16.8.3"
24 18
   }
25 19
 }

+ 240
- 1690
demo/yarn.lock
File diff suppressed because it is too large
Vedi File