Browse Source

upgrade to RN 0.48.4

Yonah Forst 7 years ago
parent
commit
f0e0f5cb8c

+ 2
- 2
Example/.babelrc View File

1
 {
1
 {
2
-"presets": ["react-native"]
3
-}
2
+  "presets": ["react-native"]
3
+}

+ 6
- 5
Example/.flowconfig View File

22
 flow/
22
 flow/
23
 
23
 
24
 [options]
24
 [options]
25
-module.system=haste
25
+emoji=true
26
 
26
 
27
-experimental.strict_type_args=true
27
+module.system=haste
28
 
28
 
29
 munge_underscores=true
29
 munge_underscores=true
30
 
30
 
34
 suppress_type=$FlowFixMe
34
 suppress_type=$FlowFixMe
35
 suppress_type=$FixMe
35
 suppress_type=$FixMe
36
 
36
 
37
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-7]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
38
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-7]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
37
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
38
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
39
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
39
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
40
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
40
 
41
 
41
 unsafe.enable_getters_and_setters=true
42
 unsafe.enable_getters_and_setters=true
42
 
43
 
43
 [version]
44
 [version]
44
-^0.37.0
45
+^0.49.1

+ 0
- 1
Example/.gitignore View File

39
 # BUCK
39
 # BUCK
40
 buck-out/
40
 buck-out/
41
 \.buckd/
41
 \.buckd/
42
-android/app/libs
43
 *.keystore
42
 *.keystore
44
 
43
 
45
 # fastlane
44
 # fastlane

+ 26
- 27
Example/android/app/BUCK View File

1
-import re
2
-
3
 # To learn about Buck see [Docs](https://buckbuild.com/).
1
 # To learn about Buck see [Docs](https://buckbuild.com/).
4
 # To run your application with Buck:
2
 # To run your application with Buck:
5
 # - install Buck
3
 # - install Buck
11
 #
9
 #
12
 
10
 
13
 lib_deps = []
11
 lib_deps = []
12
+
14
 for jarfile in glob(['libs/*.jar']):
13
 for jarfile in glob(['libs/*.jar']):
15
-  name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile)
14
+  name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
16
   lib_deps.append(':' + name)
15
   lib_deps.append(':' + name)
17
   prebuilt_jar(
16
   prebuilt_jar(
18
     name = name,
17
     name = name,
20
   )
19
   )
21
 
20
 
22
 for aarfile in glob(['libs/*.aar']):
21
 for aarfile in glob(['libs/*.aar']):
23
-  name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile)
22
+  name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
24
   lib_deps.append(':' + name)
23
   lib_deps.append(':' + name)
25
   android_prebuilt_aar(
24
   android_prebuilt_aar(
26
     name = name,
25
     name = name,
28
   )
27
   )
29
 
28
 
30
 android_library(
29
 android_library(
31
-  name = 'all-libs',
32
-  exported_deps = lib_deps
30
+    name = "all-libs",
31
+    exported_deps = lib_deps,
33
 )
32
 )
34
 
33
 
35
 android_library(
34
 android_library(
36
-  name = 'app-code',
37
-  srcs = glob([
38
-    'src/main/java/**/*.java',
39
-  ]),
40
-  deps = [
41
-    ':all-libs',
42
-    ':build_config',
43
-    ':res',
44
-  ],
35
+    name = "app-code",
36
+    srcs = glob([
37
+        "src/main/java/**/*.java",
38
+    ]),
39
+    deps = [
40
+        ":all-libs",
41
+        ":build_config",
42
+        ":res",
43
+    ],
45
 )
44
 )
46
 
45
 
47
 android_build_config(
46
 android_build_config(
48
-  name = 'build_config',
49
-  package = 'com.example',
47
+    name = "build_config",
48
+    package = "com.example",
50
 )
49
 )
51
 
50
 
52
 android_resource(
51
 android_resource(
53
-  name = 'res',
54
-  res = 'src/main/res',
55
-  package = 'com.example',
52
+    name = "res",
53
+    package = "com.example",
54
+    res = "src/main/res",
56
 )
55
 )
57
 
56
 
58
 android_binary(
57
 android_binary(
59
-  name = 'app',
60
-  package_type = 'debug',
61
-  manifest = 'src/main/AndroidManifest.xml',
62
-  keystore = '//android/keystores:debug',
63
-  deps = [
64
-    ':app-code',
65
-  ],
58
+    name = "app",
59
+    keystore = "//android/keystores:debug",
60
+    manifest = "src/main/AndroidManifest.xml",
61
+    package_type = "debug",
62
+    deps = [
63
+        ":app-code",
64
+    ],
66
 )
65
 )

+ 8
- 1
Example/android/app/build.gradle View File

33
  *   // bundleInPaidRelease: true,
33
  *   // bundleInPaidRelease: true,
34
  *   // bundleInBeta: true,
34
  *   // bundleInBeta: true,
35
  *
35
  *
36
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
37
+ *   // for example: to disable dev mode in the staging build type (if configured)
38
+ *   devDisabledInStaging: true,
39
+ *   // The configuration property can be in the following formats
40
+ *   //         'devDisabledIn${productFlavor}${buildType}'
41
+ *   //         'devDisabledIn${buildType}'
42
+ *
36
  *   // the root of your project, i.e. where "package.json" lives
43
  *   // the root of your project, i.e. where "package.json" lives
37
  *   root: "../../",
44
  *   root: "../../",
38
  *
45
  *
58
  *   inputExcludes: ["android/**", "ios/**"],
65
  *   inputExcludes: ["android/**", "ios/**"],
59
  *
66
  *
60
  *   // override which node gets called and with what additional arguments
67
  *   // override which node gets called and with what additional arguments
61
- *   nodeExecutableAndArgs: ["node"]
68
+ *   nodeExecutableAndArgs: ["node"],
62
  *
69
  *
63
  *   // supply additional arguments to the packager
70
  *   // supply additional arguments to the packager
64
  *   extraPackagerArgs: []
71
  *   extraPackagerArgs: []

+ 4
- 0
Example/android/app/proguard-rules.pro View File

50
 
50
 
51
 -dontwarn com.facebook.react.**
51
 -dontwarn com.facebook.react.**
52
 
52
 
53
+# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
54
+# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
55
+-dontwarn android.text.StaticLayout
56
+
53
 # okhttp
57
 # okhttp
54
 
58
 
55
 -keepattributes Signature
59
 -keepattributes Signature

+ 2
- 1
Example/android/app/src/main/AndroidManifest.xml View File

24
       <activity
24
       <activity
25
         android:name=".MainActivity"
25
         android:name=".MainActivity"
26
         android:label="@string/app_name"
26
         android:label="@string/app_name"
27
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
27
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
28
+        android:windowSoftInputMode="adjustResize">
28
         <intent-filter>
29
         <intent-filter>
29
             <action android:name="android.intent.action.MAIN" />
30
             <action android:name="android.intent.action.MAIN" />
30
             <category android:name="android.intent.category.LAUNCHER" />
31
             <category android:name="android.intent.category.LAUNCHER" />

+ 0
- 2
Example/android/app/src/main/java/com/example/MainApplication.java View File

1
 package com.example;
1
 package com.example;
2
 
2
 
3
 import android.app.Application;
3
 import android.app.Application;
4
-import android.util.Log;
5
 
4
 
6
 import com.facebook.react.ReactApplication;
5
 import com.facebook.react.ReactApplication;
7
-import com.facebook.react.ReactInstanceManager;
8
 import com.facebook.react.ReactNativeHost;
6
 import com.facebook.react.ReactNativeHost;
9
 import com.facebook.react.ReactPackage;
7
 import com.facebook.react.ReactPackage;
10
 import com.facebook.react.shell.MainReactPackage;
8
 import com.facebook.react.shell.MainReactPackage;

+ 1
- 2
Example/android/build.gradle View File

5
         jcenter()
5
         jcenter()
6
     }
6
     }
7
     dependencies {
7
     dependencies {
8
-        classpath 'com.android.tools.build:gradle:2.1.2'
9
-
8
+        classpath 'com.android.tools.build:gradle:2.2.3'
10
         // NOTE: Do not place your application dependencies here; they belong
9
         // NOTE: Do not place your application dependencies here; they belong
11
         // in the individual module build.gradle files
10
         // in the individual module build.gradle files
12
     }
11
     }

+ 1
- 1
Example/android/gradle/wrapper/gradle-wrapper.properties View File

3
 distributionPath=wrapper/dists
3
 distributionPath=wrapper/dists
4
 zipStoreBase=GRADLE_USER_HOME
4
 zipStoreBase=GRADLE_USER_HOME
5
 zipStorePath=wrapper/dists
5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

+ 6
- 6
Example/android/keystores/BUCK View File

1
 keystore(
1
 keystore(
2
-  name = 'debug',
3
-  store = 'debug.keystore',
4
-  properties = 'debug.keystore.properties',
5
-  visibility = [
6
-    'PUBLIC',
7
-  ],
2
+    name = "debug",
3
+    properties = "debug.keystore.properties",
4
+    store = "debug.keystore",
5
+    visibility = [
6
+        "PUBLIC",
7
+    ],
8
 )
8
 )

+ 30
- 13
Example/ios/Example.xcodeproj/project.pbxproj View File

37
 		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
37
 		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
38
 		6D05A8F55CC4482AACFFC932 /* libReactNativePermissions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DF4131A2930454297EF564B /* libReactNativePermissions.a */; };
38
 		6D05A8F55CC4482AACFFC932 /* libReactNativePermissions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DF4131A2930454297EF564B /* libReactNativePermissions.a */; };
39
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
39
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
40
+		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
40
 /* End PBXBuildFile section */
41
 /* End PBXBuildFile section */
41
 
42
 
42
 /* Begin PBXContainerItemProxy section */
43
 /* Begin PBXContainerItemProxy section */
229
 			remoteGlobalIDString = 58B5119B1A9E6C1200147676;
230
 			remoteGlobalIDString = 58B5119B1A9E6C1200147676;
230
 			remoteInfo = RCTText;
231
 			remoteInfo = RCTText;
231
 		};
232
 		};
232
-		9D140CBB1F068EB400146F6C /* PBXContainerItemProxy */ = {
233
+		ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = {
233
 			isa = PBXContainerItemProxy;
234
 			isa = PBXContainerItemProxy;
234
-			containerPortal = 1CB53DB705894AAA8CB22783 /* ReactNativePermissions.xcodeproj */;
235
+			containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
235
 			proxyType = 2;
236
 			proxyType = 2;
236
-			remoteGlobalIDString = 9D23B34F1C767B80008B4819;
237
-			remoteInfo = ReactNativePermissions;
237
+			remoteGlobalIDString = 358F4ED71D1E81A9004DF814;
238
+			remoteInfo = RCTBlob;
238
 		};
239
 		};
239
 /* End PBXContainerItemProxy section */
240
 /* End PBXContainerItemProxy section */
240
 
241
 
265
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
266
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
266
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
267
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
267
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
268
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
269
+		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
268
 /* End PBXFileReference section */
270
 /* End PBXFileReference section */
269
 
271
 
270
 /* Begin PBXFrameworksBuildPhase section */
272
 /* Begin PBXFrameworksBuildPhase section */
280
 			isa = PBXFrameworksBuildPhase;
282
 			isa = PBXFrameworksBuildPhase;
281
 			buildActionMask = 2147483647;
283
 			buildActionMask = 2147483647;
282
 			files = (
284
 			files = (
285
+				ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
286
+				5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
283
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
287
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
284
 				5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
288
 				5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
285
 				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
289
 				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
422
 				3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
426
 				3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
423
 				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
427
 				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
424
 				3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
428
 				3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
429
+				3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */,
425
 			);
430
 			);
426
 			name = Products;
431
 			name = Products;
427
 			sourceTree = "<group>";
432
 			sourceTree = "<group>";
450
 				5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
455
 				5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
451
 				146833FF1AC3E56700842450 /* React.xcodeproj */,
456
 				146833FF1AC3E56700842450 /* React.xcodeproj */,
452
 				00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
457
 				00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
458
+				ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */,
453
 				00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
459
 				00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
454
 				00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
460
 				00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
455
 				78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
461
 				78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
483
 			indentWidth = 2;
489
 			indentWidth = 2;
484
 			sourceTree = "<group>";
490
 			sourceTree = "<group>";
485
 			tabWidth = 2;
491
 			tabWidth = 2;
492
+			usesTabs = 0;
486
 		};
493
 		};
487
 		83CBBA001A601CBA00E9B192 /* Products */ = {
494
 		83CBBA001A601CBA00E9B192 /* Products */ = {
488
 			isa = PBXGroup;
495
 			isa = PBXGroup;
495
 			name = Products;
502
 			name = Products;
496
 			sourceTree = "<group>";
503
 			sourceTree = "<group>";
497
 		};
504
 		};
498
-		9D140C9F1F068EB400146F6C /* Products */ = {
505
+		ADBDB9201DFEBF0600ED6528 /* Products */ = {
499
 			isa = PBXGroup;
506
 			isa = PBXGroup;
500
 			children = (
507
 			children = (
501
-				9D140CBC1F068EB400146F6C /* libReactNativePermissions.a */,
508
+				ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */,
502
 			);
509
 			);
503
 			name = Products;
510
 			name = Products;
504
 			sourceTree = "<group>";
511
 			sourceTree = "<group>";
589
 				TargetAttributes = {
596
 				TargetAttributes = {
590
 					00E356ED1AD99517003FC87E = {
597
 					00E356ED1AD99517003FC87E = {
591
 						CreatedOnToolsVersion = 6.2;
598
 						CreatedOnToolsVersion = 6.2;
599
+						DevelopmentTeam = 66SW7BQ2SM;
592
 						TestTargetID = 13B07F861A680F5B00A75B9A;
600
 						TestTargetID = 13B07F861A680F5B00A75B9A;
593
 					};
601
 					};
594
 					13B07F861A680F5B00A75B9A = {
602
 					13B07F861A680F5B00A75B9A = {
603
+						DevelopmentTeam = 66SW7BQ2SM;
595
 						SystemCapabilities = {
604
 						SystemCapabilities = {
596
 							com.apple.BackgroundModes = {
605
 							com.apple.BackgroundModes = {
597
 								enabled = 1;
606
 								enabled = 1;
629
 					ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */;
638
 					ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */;
630
 					ProjectRef = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
639
 					ProjectRef = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
631
 				},
640
 				},
641
+				{
642
+					ProductGroup = ADBDB9201DFEBF0600ED6528 /* Products */;
643
+					ProjectRef = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
644
+				},
632
 				{
645
 				{
633
 					ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
646
 					ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
634
 					ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
647
 					ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
779
 			remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
792
 			remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
780
 			sourceTree = BUILT_PRODUCTS_DIR;
793
 			sourceTree = BUILT_PRODUCTS_DIR;
781
 		};
794
 		};
782
-		3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
795
+		3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = {
783
 			isa = PBXReferenceProxy;
796
 			isa = PBXReferenceProxy;
784
 			fileType = archive.ar;
797
 			fileType = archive.ar;
785
-			path = libReact.a;
798
+			path = "libReact-tvOS.a";
786
 			remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
799
 			remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
787
 			sourceTree = BUILT_PRODUCTS_DIR;
800
 			sourceTree = BUILT_PRODUCTS_DIR;
788
 		};
801
 		};
856
 			remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
869
 			remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
857
 			sourceTree = BUILT_PRODUCTS_DIR;
870
 			sourceTree = BUILT_PRODUCTS_DIR;
858
 		};
871
 		};
859
-		9D140CBC1F068EB400146F6C /* libReactNativePermissions.a */ = {
872
+		ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = {
860
 			isa = PBXReferenceProxy;
873
 			isa = PBXReferenceProxy;
861
 			fileType = archive.ar;
874
 			fileType = archive.ar;
862
-			path = libReactNativePermissions.a;
863
-			remoteRef = 9D140CBB1F068EB400146F6C /* PBXContainerItemProxy */;
875
+			path = libRCTBlob.a;
876
+			remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */;
864
 			sourceTree = BUILT_PRODUCTS_DIR;
877
 			sourceTree = BUILT_PRODUCTS_DIR;
865
 		};
878
 		};
866
 /* End PBXReferenceProxy section */
879
 /* End PBXReferenceProxy section */
912
 			);
925
 			);
913
 			runOnlyForDeploymentPostprocessing = 0;
926
 			runOnlyForDeploymentPostprocessing = 0;
914
 			shellPath = /bin/sh;
927
 			shellPath = /bin/sh;
915
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
928
+			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
916
 		};
929
 		};
917
 		2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
930
 		2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
918
 			isa = PBXShellScriptBuildPhase;
931
 			isa = PBXShellScriptBuildPhase;
926
 			);
939
 			);
927
 			runOnlyForDeploymentPostprocessing = 0;
940
 			runOnlyForDeploymentPostprocessing = 0;
928
 			shellPath = /bin/sh;
941
 			shellPath = /bin/sh;
929
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
942
+			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
930
 		};
943
 		};
931
 /* End PBXShellScriptBuildPhase section */
944
 /* End PBXShellScriptBuildPhase section */
932
 
945
 
997
 			isa = XCBuildConfiguration;
1010
 			isa = XCBuildConfiguration;
998
 			buildSettings = {
1011
 			buildSettings = {
999
 				BUNDLE_LOADER = "$(TEST_HOST)";
1012
 				BUNDLE_LOADER = "$(TEST_HOST)";
1013
+				DEVELOPMENT_TEAM = 66SW7BQ2SM;
1000
 				GCC_PREPROCESSOR_DEFINITIONS = (
1014
 				GCC_PREPROCESSOR_DEFINITIONS = (
1001
 					"DEBUG=1",
1015
 					"DEBUG=1",
1002
 					"$(inherited)",
1016
 					"$(inherited)",
1024
 			buildSettings = {
1038
 			buildSettings = {
1025
 				BUNDLE_LOADER = "$(TEST_HOST)";
1039
 				BUNDLE_LOADER = "$(TEST_HOST)";
1026
 				COPY_PHASE_STRIP = NO;
1040
 				COPY_PHASE_STRIP = NO;
1041
+				DEVELOPMENT_TEAM = 66SW7BQ2SM;
1027
 				INFOPLIST_FILE = ExampleTests/Info.plist;
1042
 				INFOPLIST_FILE = ExampleTests/Info.plist;
1028
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1043
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1029
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1044
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1048
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1063
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1049
 				CURRENT_PROJECT_VERSION = 1;
1064
 				CURRENT_PROJECT_VERSION = 1;
1050
 				DEAD_CODE_STRIPPING = NO;
1065
 				DEAD_CODE_STRIPPING = NO;
1066
+				DEVELOPMENT_TEAM = 66SW7BQ2SM;
1051
 				INFOPLIST_FILE = Example/Info.plist;
1067
 				INFOPLIST_FILE = Example/Info.plist;
1052
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1068
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1053
 				OTHER_LDFLAGS = (
1069
 				OTHER_LDFLAGS = (
1065
 			buildSettings = {
1081
 			buildSettings = {
1066
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1082
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1067
 				CURRENT_PROJECT_VERSION = 1;
1083
 				CURRENT_PROJECT_VERSION = 1;
1084
+				DEVELOPMENT_TEAM = 66SW7BQ2SM;
1068
 				INFOPLIST_FILE = Example/Info.plist;
1085
 				INFOPLIST_FILE = Example/Info.plist;
1069
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1086
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1070
 				OTHER_LDFLAGS = (
1087
 				OTHER_LDFLAGS = (

+ 1
- 1
Example/ios/ExampleTests/ExampleTests.m View File

37
 
37
 
38
 - (void)testRendersWelcomeScreen
38
 - (void)testRendersWelcomeScreen
39
 {
39
 {
40
-  UIViewController *vc = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
40
+  UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController];
41
   NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
41
   NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
42
   BOOL foundElement = NO;
42
   BOOL foundElement = NO;
43
 
43
 

+ 21
- 21
Example/package.json View File

1
 {
1
 {
2
-	"name": "Example",
3
-	"version": "0.0.1",
4
-	"private": true,
5
-	"scripts": {
6
-		"start": "react-native start",
7
-		"test": "jest"
8
-	},
9
-	"dependencies": {
10
-		"react": "15.4.2",
11
-		"react-native": "^0.41.0",
2
+  "name": "Example",
3
+  "version": "0.0.1",
4
+  "private": true,
5
+  "scripts": {
6
+    "start": "react-native start",
7
+    "test": "jest"
8
+  },
9
+  "dependencies": {
10
+    "react": "^16.0.0-alpha.12",
11
+    "react-native": "^0.48.4",
12
     "react-native-permissions": "../"
12
     "react-native-permissions": "../"
13
-	},
14
-	"devDependencies": {
15
-		"babel-jest": "18.0.0",
16
-		"babel-preset-react-native": "1.9.1",
17
-		"jest": "18.1.0",
18
-		"react-test-renderer": "15.4.2"
19
-	},
20
-	"jest": {
21
-		"preset": "react-native"
22
-	}
23
-}
13
+  },
14
+  "devDependencies": {
15
+    "babel-jest": "18.0.0",
16
+    "babel-preset-react-native": "1.9.1",
17
+    "jest": "18.1.0",
18
+    "react-test-renderer": "15.4.2"
19
+  },
20
+  "jest": {
21
+    "preset": "react-native"
22
+  }
23
+}