[0.38.0-rc.1] Bump version numbers

.eslintrc

@@ -61,7 +61,6 @@
     "SyntheticEvent": false,
     "$Either": false,
     "$All": false,
-    "$ArrayBufferView": false,
     "$Tuple": false,
     "$Supertype": false,
     "$Subtype": false,
@@ -79,7 +78,6 @@
     "comma-dangle": 0,               // disallow trailing commas in object literals
     "no-cond-assign": 1,             // disallow assignment in conditional expressions
     "no-console": 0,                 // disallow use of console (off by default in the node environment)
-    "no-const-assign": 2,            // disallow assignment to const-declared variables
     "no-constant-condition": 0,      // disallow use of constant expressions in conditions
     "no-control-regex": 1,           // disallow control characters in regular expressions
     "no-debugger": 1,                // disallow use of debugger

.flowconfig

@@ -1,24 +1,29 @@
 [ignore]
-; We fork some components by platform
+
+# We fork some components by platform.
 .*/*[.]android.js
 
-; Ignore templates for 'react-native init'
-.*/local-cli/templates/.*
+# Ignore templates with `@flow` in header
+.*/local-cli/generator.*
 
-; Ignore the website subdir
+# Ignore malformed json
+.*/node_modules/y18n/test/.*\.json
+
+# Ignore the website subdir
 <PROJECT_ROOT>/website/.*
 
-; Ignore "BUCK" generated dirs
+# Ignore BUCK generated dirs
 <PROJECT_ROOT>/\.buckd/
 
-; Ignore unexpected extra "@providesModule"
+# Ignore unexpected extra @providesModule
+.*/node_modules/commoner/test/source/widget/share.js
 .*/node_modules/.*/node_modules/fbjs/.*
 
-; Ignore duplicate module providers
-; For RN Apps installed via npm, "Libraries" folder is inside
-; "node_modules/react-native" but in the source repo it is in the root
+# Ignore duplicate module providers
+# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
 .*/Libraries/react-native/React.js
 .*/Libraries/react-native/ReactNative.js
+.*/node_modules/jest-runtime/build/__tests__/.*
 
 [include]
 
@@ -27,25 +32,27 @@ Libraries/react-native/react-native-interface.js
 flow/
 
 [options]
-emoji=true
-
 module.system=haste
 
+esproposal.class_static_fields=enable
+esproposal.class_instance_fields=enable
+
 experimental.strict_type_args=true
 
 munge_underscores=true
 
+module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-8]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-8]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+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]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.38.0
+^0.33.0

.github/ISSUE_TEMPLATE.md

@@ -14,10 +14,6 @@ If you have a feature request, post it on Product Pains: https://productpains.co
 
 [FILL THIS OUT: Try to reproduce your bug on rnplay.org and provide a link. If you can't reproduce the bug on rnplay.org, provide a sample project.]
 
-### Solution
-
-[FILL THIS OUT: What needs to be done to address this issue? Ideally, provide a pull request with a fix.]
-
 ### Additional Information
 
 * React Native version: [FILL THIS OUT]

.gitignore

@@ -53,4 +53,3 @@ node_modules
 
 # Test generated files
 /ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
-*.js.meta

.travis.yml

@@ -18,19 +18,15 @@ script:
   - if [[ "$TEST_TYPE" = objc-ios ]]; then travis_retry travis_wait ./scripts/objc-test-ios.sh; fi
   - if [[ "$TEST_TYPE" = objc-tvos ]]; then travis_retry travis_wait ./scripts/objc-test-tvos.sh; fi
   - if [[ "$TEST_TYPE" = e2e-objc ]]; then node ./scripts/run-ci-e2e-tests.js --ios --js --retries 3; fi
-  - if [[ "$TEST_TYPE" = e2e-objc-tvos ]]; then node ./scripts/run-ci-e2e-tests.js --tvos --retries 3; fi
   - if [[ "$TEST_TYPE" = js ]]; then npm run flow check; fi
   - if [[ "$TEST_TYPE" = js ]]; then npm test -- --maxWorkers=1; fi
-  - if [[ ( "$TEST_TYPE" = podspecs ) && ( "$TRAVIS_PULL_REQUEST" = "false" ) ]]; then gem install cocoapods && ./scripts/process-podspecs.sh; fi
 
 env:
   matrix:
-    - TEST_TYPE=e2e-objc-tvos
     - TEST_TYPE=e2e-objc
     - TEST_TYPE=objc-ios
     - TEST_TYPE=objc-tvos
     - TEST_TYPE=js
-    - TEST_TYPE=podspecs
 
 branches:
   only:
@@ -41,6 +37,5 @@ notifications:
   email:
     recipients:
       - bestander@gmail.com
-      - mkonicek@fb.com
     on_failure: change
     on_success: change

Examples/Movies/Movies.xcodeproj/xcshareddata/xcschemes/Movies.xcscheme

@@ -3,23 +3,9 @@
    LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
-               BuildableName = "libReact.a"
-               BlueprintName = "React"
-               ReferencedContainer = "container:../../React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -37,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -56,11 +42,11 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -79,10 +65,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

Examples/Movies/MoviesApp.android.js

@@ -1,11 +1,4 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
  * The examples provided by Facebook are for non-commercial testing and
  * evaluation purposes only.
  *
@@ -25,8 +18,6 @@
 
 var React = require('react');
 var ReactNative = require('react-native');
-
-var nativeImageSource = require('nativeImageSource');
 var {
   AppRegistry,
   BackAndroid,
@@ -59,11 +50,7 @@ var RouteMapper = function(route, navigationOperations, onComponentRef) {
       <View style={{flex: 1}}>
         <ToolbarAndroid
           actions={[]}
-          navIcon={nativeImageSource({
-            android: 'android_back_white',
-            width: 96,
-            height: 96
-          })}
+          navIcon={require('image!android_back_white')}
           onIconClicked={navigationOperations.pop}
           style={styles.toolbar}
           titleColor="white"

Examples/Movies/SearchBar.android.js

@@ -1,11 +1,4 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
  * The examples provided by Facebook are for non-commercial testing and
  * evaluation purposes only.
  *
@@ -25,8 +18,6 @@
 
 var React = require('react');
 var ReactNative = require('react-native');
-
-var nativeImageSource = require('nativeImageSource');
 var {
   Image,
   Platform,
@@ -51,11 +42,7 @@ class SearchBar extends React.Component {
             onPress={() => this.refs.input && this.refs.input.focus()}>
           <View>
             <Image
-              source={nativeImageSource({
-                android: 'android_search_white',
-                width: 96,
-                height: 96
-              })}
+              source={require('image!android_search_white')}
               style={styles.icon}
             />
           </View>

Examples/Movies/SearchScreen.js

@@ -299,7 +299,7 @@ var SearchScreen = React.createClass({
         onEndReached={this.onEndReached}
         automaticallyAdjustContentInsets={false}
         keyboardDismissMode="on-drag"
-        keyboardShouldPersistTaps="handled"
+        keyboardShouldPersistTaps={true}
         showsVerticalScrollIndicator={false}
       />;
 

Examples/Movies/android/app/BUCK

@@ -15,9 +15,9 @@ android_library(
   deps = [
     ':res',
     react_native_dep('third-party/java/jsr-305:jsr-305'),
-    react_native_target('java/com/facebook/react:react'),
     react_native_target('java/com/facebook/react/modules/core:core'),
     react_native_target('java/com/facebook/react/shell:shell'),
+    react_native_target('java/com/facebook/react:react'),
     react_native_target('jni/prebuilt:android-jsc'),
     # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
     react_native_target('jni/prebuilt:reactnative-libs'),

Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesApplication.java

@@ -39,7 +39,7 @@ public class MoviesApplication extends Application implements ReactApplication {
     }
 
     @Override
-    public boolean getUseDeveloperSupport() {
+    protected boolean getUseDeveloperSupport() {
       return true;
     }
 

Examples/TicTacToe/TicTacToe.xcodeproj/xcshareddata/xcschemes/TicTacToe.xcscheme

@@ -3,23 +3,9 @@
    LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
-               BuildableName = "libReact.a"
-               BlueprintName = "React"
-               ReferencedContainer = "container:../../React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -37,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -56,11 +42,11 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -79,10 +65,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

Examples/TicTacToe/TicTacToeApp.js

@@ -1,11 +1,4 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
  * The examples provided by Facebook are for non-commercial testing and
  * evaluation purposes only.
  *
@@ -102,7 +95,7 @@ class Board {
 }
 
 class Cell extends React.Component {
-  cellStyle() {
+  cellStyle = () => {
     switch (this.props.player) {
       case 1:
         return styles.cellX;
@@ -111,9 +104,9 @@ class Cell extends React.Component {
       default:
         return null;
     }
-  }
+  };
 
-  textStyle() {
+  textStyle = () => {
     switch (this.props.player) {
       case 1:
         return styles.cellTextX;
@@ -122,9 +115,9 @@ class Cell extends React.Component {
       default:
         return {};
     }
-  }
+  };
 
-  textContents() {
+  textContents = () => {
     switch (this.props.player) {
       case 1:
         return 'X';
@@ -133,7 +126,7 @@ class Cell extends React.Component {
       default:
         return '';
     }
-  }
+  };
 
   render() {
     return (
@@ -158,7 +151,7 @@ class GameEndOverlay extends React.Component {
     var tie = board.tie();
     var winner = board.winner();
     if (!winner && !tie) {
-      return null;
+      return <View />;
     }
 
     var message;
@@ -265,6 +258,7 @@ var styles = StyleSheet.create({
     borderRadius: 5,
     backgroundColor: '#7b8994',
     margin: 5,
+    flex: 1,
     justifyContent: 'center',
     alignItems: 'center',
   },

Examples/TicTacToe/android/app/BUCK

@@ -15,9 +15,9 @@ android_library(
   deps = [
     ':res',
     react_native_dep('third-party/java/jsr-305:jsr-305'),
-    react_native_target('java/com/facebook/react:react'),
     react_native_target('java/com/facebook/react/modules/core:core'),
     react_native_target('java/com/facebook/react/shell:shell'),
+    react_native_target('java/com/facebook/react:react'),
     react_native_target('jni/prebuilt:android-jsc'),
     # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
     react_native_target('jni/prebuilt:reactnative-libs'),

Examples/TicTacToe/android/app/src/main/java/com/facebook/react/tictactoe/TicTacToeApplication.java

@@ -39,7 +39,7 @@ public class TicTacToeApplication extends Application implements ReactApplicatio
     }
 
     @Override
-    public boolean getUseDeveloperSupport() {
+    protected boolean getUseDeveloperSupport() {
       return true;
     }
 

Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj

@@ -87,6 +87,7 @@
 		2D4BD8E61DA2E20D005AC8A8 /* TestBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 3DD981D51D33C6FB007DC7BE /* TestBundle.js */; };
 		2D4BD8E71DA2E20D005AC8A8 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14D6D7101B220EB3001FB087 /* libOCMock.a */; };
 		2D8C2E321DA40403000EE098 /* RCTMultipartStreamReaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 001BFCE31D838343008E587E /* RCTMultipartStreamReaderTests.m */; };
+		2DD0EFF41DA853B200B0C975 /* libRCTPushNotification-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD0EFF31DA853B200B0C975 /* libRCTPushNotification-tvOS.a */; };
 		2DD323DC1DA2DDBF000FE1B8 /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; };
 		2DD323DD1DA2DDBF000FE1B8 /* UpdatePropertiesExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */; };
 		2DD323DE1DA2DDBF000FE1B8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
@@ -95,6 +96,7 @@
 		2DD323E11DA2DDBF000FE1B8 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; };
 		2DD323E21DA2DDBF000FE1B8 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB61A68108700A75B9A /* Info.plist */; };
 		2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation-tvOS.a */; };
+		2DD323E41DA2DE3F000FE1B8 /* libRCTImage-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323BB1DA2DD8B000FE1B8 /* libRCTImage-tvOS.a */; };
 		2DD323E51DA2DE3F000FE1B8 /* libRCTLinking-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323BF1DA2DD8B000FE1B8 /* libRCTLinking-tvOS.a */; };
 		2DD323E61DA2DE3F000FE1B8 /* libRCTNetwork-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323C31DA2DD8B000FE1B8 /* libRCTNetwork-tvOS.a */; };
 		2DD323E71DA2DE3F000FE1B8 /* libRCTSettings-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323C81DA2DD8B000FE1B8 /* libRCTSettings-tvOS.a */; };
@@ -103,12 +105,10 @@
 		2DD323EA1DA2DE3F000FE1B8 /* libReact-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D91DA2DD8B000FE1B8 /* libReact-tvOS.a */; };
 		3578590A1B28D2CF00341EDB /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 357859011B28D2C500341EDB /* libRCTLinking.a */; };
 		39AA31A41DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 39AA31A31DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m */; };
-		3D05746D1DE6008900184BB4 /* libRCTPushNotification-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D05746C1DE6008900184BB4 /* libRCTPushNotification-tvOS.a */; };
 		3D13F8481D6F6AF900E69E0E /* ImageInBundle.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F8441D6F6AF200E69E0E /* ImageInBundle.png */; };
 		3D13F84A1D6F6AFD00E69E0E /* OtherImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F8451D6F6AF200E69E0E /* OtherImages.xcassets */; };
 		3D299BAF1D33EBFA00FA1057 /* RCTLoggingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D299BAE1D33EBFA00FA1057 /* RCTLoggingTests.m */; };
 		3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; };
-		3D302F221DF8285100D6DDAE /* libRCTImage-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323BB1DA2DD8B000FE1B8 /* libRCTImage-tvOS.a */; };
 		3D56F9F11D6F6E9B00F53A06 /* UIExplorerBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F83E1D6F6AE000E69E0E /* UIExplorerBundle.bundle */; };
 		3DB99D0C1BA0340600302749 /* UIExplorerIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB99D0B1BA0340600302749 /* UIExplorerIntegrationTests.m */; };
 		3DD981D61D33C6FB007DC7BE /* TestBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 3DD981D51D33C6FB007DC7BE /* TestBundle.js */; };
@@ -117,7 +117,6 @@
 		83636F8F1B53F22C009F943E /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */; };
 		8385CEF51B873B5C00C6273E /* RCTImageLoaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */; };
 		8385CF041B87479200C6273E /* RCTImageLoaderHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */; };
-		BC9C03401DC9F1D600B1C635 /* RCTDevMenuTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BC9C033F1DC9F1D600B1C635 /* RCTDevMenuTests.m */; };
 		D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
 /* End PBXBuildFile section */
 
@@ -213,6 +212,13 @@
 			remoteGlobalIDString = 2DD3238F1DA2DD8A000FE1B8;
 			remoteInfo = "UIExplorer-tvOS";
 		};
+		2DD0EFF21DA853B200B0C975 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 14DC67E71AB71876001358AB /* RCTPushNotification.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2DD0EFE61DA8533A00B0C975;
+			remoteInfo = "RCTPushNotification-tvOS";
+		};
 		2DD323A61DA2DD8B000FE1B8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
@@ -290,41 +296,6 @@
 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
 			remoteInfo = RCTLinking;
 		};
-		3D05746B1DE6008900184BB4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14DC67E71AB71876001358AB /* RCTPushNotification.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D05745F1DE6004600184BB4;
-			remoteInfo = "RCTPushNotification-tvOS";
-		};
-		3D05748B1DE6008900184BB4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4;
-			remoteInfo = cxxreact;
-		};
-		3D05748D1DE6008900184BB4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
-			remoteInfo = "cxxreact-tvOS";
-		};
-		3D05748F1DE6008900184BB4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
-			remoteInfo = jschelpers;
-		};
-		3D0574911DE6008900184BB4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
-			remoteInfo = "jschelpers-tvOS";
-		};
 		3D13F84B1D6F6B5F00E69E0E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
@@ -332,20 +303,6 @@
 			remoteGlobalIDString = 3D13F83D1D6F6AE000E69E0E;
 			remoteInfo = UIExplorerBundle;
 		};
-		3D3C08801DE3424E00C268FA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3C059A1DE3340900C268FA;
-			remoteInfo = yoga;
-		};
-		3D3C08821DE3424E00C268FA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3C06751DE3340C00C268FA;
-			remoteInfo = "yoga-tvOS";
-		};
 		58005BED1ABA80530062E044 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 58005BE41ABA80530062E044 /* RCTTest.xcodeproj */;
@@ -447,7 +404,6 @@
 		8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderTests.m; sourceTree = "<group>"; };
 		8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderHelpers.m; sourceTree = "<group>"; };
 		8385CF051B8747A000C6273E /* RCTImageLoaderHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTImageLoaderHelpers.h; sourceTree = "<group>"; };
-		BC9C033F1DC9F1D600B1C635 /* RCTDevMenuTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDevMenuTests.m; sourceTree = "<group>"; };
 		D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -482,9 +438,9 @@
 				13E501F11D07A84A005F35D8 /* libRCTAnimation.a in Frameworks */,
 				138DEE241B9EDFB6007F4EA5 /* libRCTCameraRoll.a in Frameworks */,
 				134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */,
-				1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */,
 				13417FE91AA91432003F314A /* libRCTImage.a in Frameworks */,
 				3578590A1B28D2CF00341EDB /* libRCTLinking.a in Frameworks */,
+				1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */,
 				14DC67F41AB71881001358AB /* libRCTPushNotification.a in Frameworks */,
 				834C36EC1AF8DED70019C93C /* libRCTSettings.a in Frameworks */,
 				134180011AA9153C003F314A /* libRCTText.a in Frameworks */,
@@ -513,15 +469,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2DD323EA1DA2DE3F000FE1B8 /* libReact-tvOS.a in Frameworks */,
+				2DD0EFF41DA853B200B0C975 /* libRCTPushNotification-tvOS.a in Frameworks */,
 				2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation-tvOS.a in Frameworks */,
-				3D302F221DF8285100D6DDAE /* libRCTImage-tvOS.a in Frameworks */,
+				2DD323E41DA2DE3F000FE1B8 /* libRCTImage-tvOS.a in Frameworks */,
 				2DD323E51DA2DE3F000FE1B8 /* libRCTLinking-tvOS.a in Frameworks */,
 				2DD323E61DA2DE3F000FE1B8 /* libRCTNetwork-tvOS.a in Frameworks */,
-				3D05746D1DE6008900184BB4 /* libRCTPushNotification-tvOS.a in Frameworks */,
 				2DD323E71DA2DE3F000FE1B8 /* libRCTSettings-tvOS.a in Frameworks */,
 				2DD323E81DA2DE3F000FE1B8 /* libRCTText-tvOS.a in Frameworks */,
 				2DD323E91DA2DE3F000FE1B8 /* libRCTWebSocket-tvOS.a in Frameworks */,
+				2DD323EA1DA2DE3F000FE1B8 /* libReact-tvOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -681,7 +637,6 @@
 				001BFCE31D838343008E587E /* RCTMultipartStreamReaderTests.m */,
 				138D6A161B53CD440074A87E /* RCTShadowViewTests.m */,
 				1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */,
-				BC9C033F1DC9F1D600B1C635 /* RCTDevMenuTests.m */,
 				13BCE84E1C9C209600DD7AAD /* RCTComponentPropsTests.m */,
 				39AA31A31DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m */,
 				143BC57E1B21E18100462512 /* Info.plist */,
@@ -726,12 +681,6 @@
 			children = (
 				14AADF041AC3DB95002390C9 /* libReact.a */,
 				2DD323D91DA2DD8B000FE1B8 /* libReact-tvOS.a */,
-				3D3C08811DE3424E00C268FA /* libyoga.a */,
-				3D3C08831DE3424E00C268FA /* libyoga-tvOS.a */,
-				3D05748C1DE6008900184BB4 /* libcxxreact.a */,
-				3D05748E1DE6008900184BB4 /* libcxxreact-tvOS.a */,
-				3D0574901DE6008900184BB4 /* libjschelpers.a */,
-				3D0574921DE6008900184BB4 /* libjschelpers-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -763,7 +712,7 @@
 			isa = PBXGroup;
 			children = (
 				14DC67F11AB71876001358AB /* libRCTPushNotification.a */,
-				3D05746C1DE6008900184BB4 /* libRCTPushNotification-tvOS.a */,
+				2DD0EFF31DA853B200B0C975 /* libRCTPushNotification-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1185,6 +1134,13 @@
 			remoteRef = 14DC67F01AB71876001358AB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		2DD0EFF31DA853B200B0C975 /* libRCTPushNotification-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libRCTPushNotification-tvOS.a";
+			remoteRef = 2DD0EFF21DA853B200B0C975 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation-tvOS.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1255,55 +1211,6 @@
 			remoteRef = 357859001B28D2C500341EDB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3D05746C1DE6008900184BB4 /* libRCTPushNotification-tvOS.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libRCTPushNotification-tvOS.a";
-			remoteRef = 3D05746B1DE6008900184BB4 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		3D05748C1DE6008900184BB4 /* libcxxreact.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libcxxreact.a;
-			remoteRef = 3D05748B1DE6008900184BB4 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		3D05748E1DE6008900184BB4 /* libcxxreact-tvOS.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libcxxreact-tvOS.a";
-			remoteRef = 3D05748D1DE6008900184BB4 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		3D0574901DE6008900184BB4 /* libjschelpers.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libjschelpers.a;
-			remoteRef = 3D05748F1DE6008900184BB4 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		3D0574921DE6008900184BB4 /* libjschelpers-tvOS.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libjschelpers-tvOS.a";
-			remoteRef = 3D0574911DE6008900184BB4 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		3D3C08811DE3424E00C268FA /* libyoga.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libyoga.a;
-			remoteRef = 3D3C08801DE3424E00C268FA /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		3D3C08831DE3424E00C268FA /* libyoga-tvOS.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libyoga-tvOS.a";
-			remoteRef = 3D3C08821DE3424E00C268FA /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		58005BEE1ABA80530062E044 /* libRCTTest.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1445,7 +1352,6 @@
 				39AA31A41DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m in Sources */,
 				13B6C1A31C34225900D3FAF5 /* RCTURLUtilsTests.m in Sources */,
 				8385CF041B87479200C6273E /* RCTImageLoaderHelpers.m in Sources */,
-				BC9C03401DC9F1D600B1C635 /* RCTDevMenuTests.m in Sources */,
 				68FF44381CF6111500720EFD /* RCTBundleURLProviderTests.m in Sources */,
 				8385CEF51B873B5C00C6273E /* RCTImageLoaderTests.m in Sources */,
 			);
@@ -1576,7 +1482,8 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/UIExplorerUnitTests",
+					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/UIExplorerUnitTests/**",
 				);
 				INFOPLIST_FILE = UIExplorerUnitTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -1595,7 +1502,8 @@
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/UIExplorerUnitTests",
+					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/UIExplorerUnitTests/**",
 				);
 				INFOPLIST_FILE = UIExplorerUnitTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -1612,8 +1520,14 @@
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+				);
 				INFOPLIST_FILE = "$(SRCROOT)/UIExplorer/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
@@ -1626,8 +1540,13 @@
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+				);
 				INFOPLIST_FILE = "$(SRCROOT)/UIExplorer/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
@@ -1685,6 +1604,12 @@
 					"$(inherited)",
 					"FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/$(PROJECT_NAME)IntegrationTests/ReferenceImages\\\"\"",
 				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/../../Libraries/**",
+				);
 				INFOPLIST_FILE = UIExplorerIntegrationTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -1709,6 +1634,12 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/../../Libraries/**",
+				);
 				INFOPLIST_FILE = UIExplorerIntegrationTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -1773,7 +1704,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/UIExplorerUnitTests/**",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/../../Libraries/**",
+					"$(SRCROOT)/UIExplorerUnitTests",
 				);
 				INFOPLIST_FILE = UIExplorerUnitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1801,7 +1735,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/UIExplorerUnitTests/**",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/../../Libraries/**",
+					"$(SRCROOT)/UIExplorerUnitTests",
 				);
 				INFOPLIST_FILE = UIExplorerUnitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1893,6 +1830,12 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/../../Libraries/**",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1952,6 +1895,12 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/../../Libraries/**",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (

Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme

@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2D2A28121D9B038B00D4039D"
-               BuildableName = "libReact.a"
-               BlueprintName = "React-tvOS"
-               ReferencedContainer = "container:../../React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"

Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme

@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
-               BuildableName = "libReact.a"
-               BlueprintName = "React"
-               ReferencedContainer = "container:../../React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"

Examples/UIExplorer/UIExplorer/AppDelegate.m

@@ -14,14 +14,13 @@
 
 #import "AppDelegate.h"
 
-#import <React/RCTBridge.h>
-#import <React/RCTBundleURLProvider.h>
-#import <React/RCTJavaScriptLoader.h>
-#import <React/RCTLinkingManager.h>
-#import <React/RCTRootView.h>
-
+#import "RCTBridge.h"
+#import "RCTBundleURLProvider.h"
+#import "RCTJavaScriptLoader.h"
+#import "RCTLinkingManager.h"
+#import "RCTRootView.h"
 #if !TARGET_OS_TV
-#import <React/RCTPushNotificationManager.h>
+#import "RCTPushNotificationManager.h"
 #endif
 
 @interface AppDelegate() <RCTBridgeDelegate>
@@ -56,8 +55,13 @@
 
 - (NSURL *)sourceURLForBridge:(__unused RCTBridge *)bridge
 {
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"Examples/UIExplorer/js/UIExplorerApp.ios"
-                                                        fallbackResource:nil];
+  NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"Examples/UIExplorer/js/UIExplorerApp.ios" fallbackResource:nil];
+
+  if (!getenv("CI_USE_PACKAGER")) {
+    jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+  }
+
+  return jsCodeLocation;
 }
 
 

Examples/UIExplorer/UIExplorer/Images.xcassets/blue_square.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "blue_square.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Examples/UIExplorer/UIExplorer/Images.xcassets/red_square.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "red_square.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.h

@@ -13,8 +13,7 @@
  */
 
 #import <UIKit/UIKit.h>
-
-#import <React/RCTView.h>
+#import "RCTView.h"
 
 @interface FlexibleSizeExampleView : RCTView
 

Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.m

@@ -12,15 +12,16 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#import "FlexibleSizeExampleView.h"
-
-#import <React/RCTBridge.h>
-#import <React/RCTRootView.h>
-#import <React/RCTRootViewDelegate.h>
-#import <React/RCTViewManager.h>
-
 #import "AppDelegate.h"
 
+#import "FlexibleSizeExampleView.h"
+#import "RCTJavaScriptLoader.h"
+#import "RCTBridge.h"
+#import "RCTRootView.h"
+#import "RCTRootViewDelegate.h"
+
+#import "RCTViewManager.h"
+
 @interface FlexibleSizeExampleViewManager : RCTViewManager
 
 @end
@@ -37,7 +38,7 @@ RCT_EXPORT_MODULE();
 @end
 
 
-@interface FlexibleSizeExampleView () <RCTRootViewDelegate>
+@interface FlexibleSizeExampleView ()<RCTRootViewDelegate>
 
 @end
 

Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.h

@@ -13,8 +13,7 @@
  */
 
 #import <UIKit/UIKit.h>
-
-#import <React/RCTView.h>
+#import "RCTView.h"
 
 @interface UpdatePropertiesExampleView : RCTView
 

Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.m

@@ -12,13 +12,14 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#import "UpdatePropertiesExampleView.h"
-
-#import <React/RCTRootView.h>
-#import <React/RCTViewManager.h>
-
 #import "AppDelegate.h"
 
+#import "UpdatePropertiesExampleView.h"
+#import "RCTJavaScriptLoader.h"
+#import "RCTBridge.h"
+#import "RCTRootView.h"
+#import "RCTViewManager.h"
+
 @interface UpdatePropertiesExampleViewManager : RCTViewManager
 
 @end

Examples/UIExplorer/UIExplorer/main.m

@@ -13,7 +13,6 @@
  */
 
 #import <UIKit/UIKit.h>
-
 #import "AppDelegate.h"
 
 int main(int argc, char * argv[]) {

Examples/UIExplorer/UIExplorer/maincxx.m

@@ -1,28 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTCxxBridge.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-  @autoreleasepool {
-    [RCTCxxBridge enable];
-    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}

Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme

@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0810"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "NO"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
-               BuildableName = "libReact.a"
-               BlueprintName = "React"
-               ReferencedContainer = "container:../../React/ReactCxx.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3D13F83D1D6F6AE000E69E0E"
-               BuildableName = "UIExplorerBundle.bundle"
-               BlueprintName = "UIExplorerBundle"
-               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-               BuildableName = "UIExplorer.app"
-               BlueprintName = "UIExplorer"
-               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "004D289D1AAF61C70097A701"
-               BuildableName = "UIExplorerUnitTests.xctest"
-               BlueprintName = "UIExplorerUnitTests"
-               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "143BC5941B21E3E100462512"
-               BuildableName = "UIExplorerIntegrationTests.xctest"
-               BlueprintName = "UIExplorerIntegrationTests"
-               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "UIExplorer.app"
-            BlueprintName = "UIExplorer"
-            ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "UIExplorer.app"
-            BlueprintName = "UIExplorer"
-            ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "UIExplorer.app"
-            BlueprintName = "UIExplorer"
-            ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

Examples/UIExplorer/UIExplorerIntegrationTests/RCTLoggingTests.m

@@ -14,9 +14,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import <React/RCTAssert.h>
-#import <React/RCTBridge.h>
-#import <React/RCTLog.h>
+#import "RCTAssert.h"
+#import "RCTLog.h"
+#import "RCTBridge.h"
 
 @interface RCTLoggingTests : XCTestCase
 

Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m

@@ -26,10 +26,13 @@
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
+#import "RCTAssert.h"
+
+#import "RCTEventDispatcher.h"
+#import "RCTRootView.h"
+#import "RCTRootViewDelegate.h"
+
 #import <RCTTest/RCTTestRunner.h>
-#import <React/RCTEventDispatcher.h>
-#import <React/RCTRootView.h>
-#import <React/RCTRootViewDelegate.h>
 
 #define RCT_TEST_DATA_CONFIGURATION_BLOCK(appName, testType, input, block) \
 - (void)test##appName##_##testType##_##input                               \

Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m

@@ -14,9 +14,8 @@
 
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
-
-#import <React/RCTUIManager.h>
-#import <React/UIView+React.h>
+#import "RCTUIManager.h"
+#import "UIView+React.h"
 
 @interface RCTUIManager (Testing)
 

Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m

@@ -12,20 +12,14 @@
 
 #import <RCTTest/RCTTestRunner.h>
 
+#import "RCTAssert.h"
+
 #define RCT_TEST(name)                  \
 - (void)test##name                      \
 {                                       \
   [_runner runTest:_cmd module:@#name]; \
 }
 
-#define RCT_TEST_ONLY_WITH_PACKAGER(name) \
-- (void)test##name                        \
-{                                         \
-  if (getenv("CI_USE_PACKAGER")) {        \
-    [_runner runTest:_cmd module:@#name]; \
-  }                                       \
-}
-
 @interface UIExplorerIntegrationTests : XCTestCase
 
 @end
@@ -38,7 +32,6 @@
 - (void)setUp
 {
   _runner = RCTInitRunnerForApp(@"IntegrationTests/IntegrationTestsApp", nil);
-  _runner.recordMode = NO;
 }
 
 #pragma mark - Test harness
@@ -67,12 +60,10 @@ RCT_TEST(IntegrationTestHarnessTest)
 RCT_TEST(TimersTest)
 RCT_TEST(AsyncStorageTest)
 RCT_TEST(AppEventsTest)
-RCT_TEST(ImageCachePolicyTest)
 //RCT_TEST(ImageSnapshotTest) // Disabled: #8985988
 //RCT_TEST(LayoutEventsTest) // Disabled due to flakiness: #8686784
 RCT_TEST(SimpleSnapshotTest)
 RCT_TEST(PromiseTest)
-RCT_TEST_ONLY_WITH_PACKAGER(WebSocketTest)
 
 
 @end

Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m

@@ -17,6 +17,10 @@
 
 #import <RCTTest/RCTTestRunner.h>
 
+#import "RCTAssert.h"
+#import "RCTRedBox.h"
+#import "RCTRootView.h"
+
 @interface UIExplorerSnapshotTests : XCTestCase
 {
   RCTTestRunner *_runner;
@@ -41,14 +45,12 @@
   [_runner runTest:_cmd module:@#name]; \
 }
 
+#if !TARGET_OS_TV // None of these will run in tvOS due to StatusBar not existing
 RCT_TEST(ViewExample)
 RCT_TEST(LayoutExample)
 RCT_TEST(TextExample)
-#if !TARGET_OS_TV
-// No switch or slider available on tvOS
 RCT_TEST(SwitchExample)
 RCT_TEST(SliderExample)
-// TabBarExample on tvOS passes locally but not on Travis
 RCT_TEST(TabBarExample)
 #endif
 

Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h

@@ -14,7 +14,7 @@
  *  under the License.
  */
 
-#import <OCMock/OCMRecorder.h>
+#import "OCMRecorder.h"
 
 
 @interface OCMStubRecorder : OCMRecorder
@@ -51,3 +51,6 @@
 @property (nonatomic, readonly) OCMStubRecorder *(^ _andForwardToRealObject)(void);
 
 @end
+
+
+

Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m

@@ -15,11 +15,11 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <React/RCTBridge+Private.h>
-#import <React/RCTBridge.h>
-#import <React/RCTJSCExecutor.h>
-#import <React/RCTModuleMethod.h>
-#import <React/RCTRootView.h>
+#import "RCTBridge.h"
+#import "RCTBridge+Private.h"
+#import "RCTJSCExecutor.h"
+#import "RCTModuleMethod.h"
+#import "RCTRootView.h"
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \
@@ -213,10 +213,7 @@ RCT_EXPORT_METHOD(test:(__unused NSString *)a
     (void)rootView;
   }
 
-#if !TARGET_OS_TV // userInteractionEnabled is true for Apple TV views
   XCTAssertFalse(rootContentView.userInteractionEnabled, @"RCTContentView should have been invalidated");
-#endif
-
 }
 
 - (void)testUnderlyingBridgeIsDeallocated

Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m

@@ -15,11 +15,11 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <React/RCTBridge+Private.h>
-#import <React/RCTBridge.h>
-#import <React/RCTBridgeModule.h>
-#import <React/RCTJavaScriptExecutor.h>
-#import <React/RCTUtils.h>
+#import "RCTBridge.h"
+#import "RCTBridge+Private.h"
+#import "RCTBridgeModule.h"
+#import "RCTJavaScriptExecutor.h"
+#import "RCTUtils.h"
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \

Examples/UIExplorer/UIExplorerUnitTests/RCTBundleURLProviderTests.m

@@ -13,8 +13,9 @@
  */
 #import <XCTest/XCTest.h>
 
-#import <React/RCTBundleURLProvider.h>
-#import <React/RCTUtils.h>
+#import "RCTBundleURLProvider.h"
+#import "RCTUtils.h"
+
 
 static NSString *const testFile = @"test.jsbundle";
 static NSString *const mainBundle = @"main.jsbundle";

Examples/UIExplorer/UIExplorerUnitTests/RCTComponentPropsTests.m

@@ -14,9 +14,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import <React/RCTUIManager.h>
-#import <React/RCTView.h>
-#import <React/RCTViewManager.h>
+#import "RCTUIManager.h"
+#import "RCTViewManager.h"
+#import "RCTView.h"
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \

Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m

@@ -14,8 +14,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import <React/RCTConvert.h>
-#import <React/RCTUtils.h>
+#import "RCTConvert.h"
+#import "RCTUtils.h"
 
 @interface RCTConvert_NSURLTests : XCTestCase
 

Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_YGValueTests.m

@@ -1,46 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <XCTest/XCTest.h>
-
-#import <React/RCTConvert.h>
-#import <React/RCTUtils.h>
-
-@interface RCTConvert_YGValueTests : XCTestCase
-
-@end
-
-@implementation RCTConvert_YGValueTests
-
-- (void)testUndefined
-{
-  YGValue value = [RCTConvert YGValue:nil];
-  XCTAssertEqual(value.unit, YGUnitUndefined);
-}
-
-- (void)testNumberPoints
-{
-  YGValue value = [RCTConvert YGValue:@100];
-  XCTAssertEqual(value.unit, YGUnitPixel);
-  XCTAssertEqual(value.value, 100);
-}
-
-- (void)testStringPercent
-{
-  YGValue value = [RCTConvert YGValue:@"100%"];
-  XCTAssertEqual(value.unit, YGUnitPercent);
-  XCTAssertEqual(value.value, 100);
-}
-
-@end

Examples/UIExplorer/UIExplorerUnitTests/RCTDevMenuTests.m

@@ -1,69 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <XCTest/XCTest.h>
-
-#import <React/RCTBridge.h>
-#import <React/RCTDevMenu.h>
-
-typedef void(^RCTDevMenuAlertActionHandler)(UIAlertAction *action);
-
-@interface RCTDevMenu ()
-
-- (RCTDevMenuAlertActionHandler)alertActionHandlerForDevItem:(RCTDevMenuItem *)item;
-
-@end
-
-@interface RCTDevMenuTests : XCTestCase
-
-@end
-
-@implementation RCTDevMenuTests
-{
-  RCTBridge *_bridge;
-}
-
-- (void)setUp
-{
-  [super setUp];
-
-  NSBundle *bundle = [NSBundle bundleForClass:[self class]];
-  _bridge = [[RCTBridge alloc] initWithBundleURL:[bundle URLForResource:@"TestBundle" withExtension:@"js"]
-                                  moduleProvider:nil
-                                   launchOptions:nil];
-}
-
-- (void)testShowCreatingActionSheet
-{
-  XCTAssertFalse([_bridge.devMenu isActionSheetShown]);
-  [_bridge.devMenu show];
-  XCTAssertTrue([_bridge.devMenu isActionSheetShown]);
-}
-
-
-- (void)testClosingActionSheetAfterAction
-{
-  for (RCTDevMenuItem *item in _bridge.devMenu.presentedItems) {
-    RCTDevMenuAlertActionHandler handler = [_bridge.devMenu alertActionHandlerForDevItem:item];
-    XCTAssertTrue([_bridge.devMenu isActionSheetShown]);
-
-    handler(nil);
-    XCTAssertFalse([_bridge.devMenu isActionSheetShown]);
-
-    [_bridge.devMenu show];
-    XCTAssertTrue([_bridge.devMenu isActionSheetShown]);
-  }
-}
-
-@end

Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m

@@ -16,9 +16,8 @@
 #import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
-
-#import <React/RCTBridge+Private.h>
-#import <React/RCTEventDispatcher.h>
+#import "RCTEventDispatcher.h"
+#import "RCTBridge+Private.h"
 
 @interface RCTTestEvent : NSObject <RCTEvent>
 @property (atomic, assign, readwrite) BOOL canCoalesce;

Examples/UIExplorer/UIExplorerUnitTests/RCTFontTests.m

@@ -12,10 +12,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#import <CoreText/CoreText.h>
 #import <XCTest/XCTest.h>
 
-#import <React/RCTFont.h>
+#import "RCTFont.h"
+
+#import <CoreText/CoreText.h>
 
 @interface RCTFontTests : XCTestCase
 

Examples/UIExplorer/UIExplorerUnitTests/RCTGzipTests.m

@@ -13,9 +13,8 @@
  */
 
 #import <XCTest/XCTest.h>
-
-#import <React/RCTNetworking.h>
-#import <React/RCTUtils.h>
+#import "RCTUtils.h"
+#import "RCTNetworking.h"
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \

Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderHelpers.h

@@ -12,7 +12,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#import <React/RCTImageLoader.h>
+#import "RCTImageLoader.h"
 
 typedef BOOL (^RCTImageURLLoaderCanLoadImageURLHandler)(NSURL *requestURL);
 typedef RCTImageLoaderCancellationBlock (^RCTImageURLLoaderLoadImageURLHandler)(NSURL *imageURL, CGSize size, CGFloat scale, RCTResizeMode resizeMode, RCTImageLoaderProgressBlock progressHandler, RCTImageLoaderCompletionBlock completionHandler);

Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m

@@ -14,9 +14,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import <React/RCTBridge.h>
-#import <React/RCTImageLoader.h>
-
+#import "RCTBridge.h"
+#import "RCTImageLoader.h"
 #import "RCTImageLoaderHelpers.h"
 
 unsigned char blackGIF[] = {

Examples/UIExplorer/UIExplorerUnitTests/RCTImageUtilTests.m

@@ -16,8 +16,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIView.h>
 #import <XCTest/XCTest.h>
-
-#import <RCTImage/RCTImageUtils.h>
+#import "RCTImageUtils.h"
 
 #define RCTAssertEqualPoints(a, b) { \
 XCTAssertEqual(a.x, b.x); \

Examples/UIExplorer/UIExplorerUnitTests/RCTJSCExecutorTests.m

@@ -16,8 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import <React/RCTJSCExecutor.h>
-#import <React/RCTUtils.h>
+#import "RCTJSCExecutor.h"
+#import "RCTUtils.h"
 
 @interface RCTJSCExecutorTests : XCTestCase
 

Examples/UIExplorer/UIExplorerUnitTests/RCTJSONTests.m

@@ -13,8 +13,7 @@
  */
 
 #import <XCTest/XCTest.h>
-
-#import <React/RCTUtils.h>
+#import "RCTUtils.h"
 
 @interface RCTJSONTests : XCTestCase
 
@@ -54,7 +53,7 @@
   NSString *jsonString = RCTJSONStringify(jsonObject, NULL);
   NSDictionary<NSString *, id> *json = RCTJSONParse(jsonString, NULL);
   XCTAssertEqualObjects(json[@"code"], @"EDOMAIN68");
-  XCTAssertEqualObjects(json[@"message"], @"The operation couldn\u2019t be completed. (domain error 68.)");
+  XCTAssertEqualObjects(json[@"message"], @"The operation couldn’t be completed. (domain error 68.)");
   XCTAssertEqualObjects(json[@"domain"], @"domain");
   XCTAssertEqualObjects(json[@"userInfo"][@"NSUnderlyingError"][@"code"], @"421");
   XCTAssertEqualObjects(json[@"userInfo"][@"NSUnderlyingError"][@"message"], @"underlying error");

Examples/UIExplorer/UIExplorerUnitTests/RCTMethodArgumentTests.m

@@ -15,7 +15,7 @@
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
-#import <React/RCTModuleMethod.h>
+#import "RCTModuleMethod.h"
 
 @interface RCTMethodArgumentTests : XCTestCase
 

Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitNotificationRaceTests.m

@@ -15,13 +15,13 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <React/RCTBridge+Private.h>
-#import <React/RCTBridge.h>
-#import <React/RCTBridgeModule.h>
-#import <React/RCTJavaScriptExecutor.h>
-#import <React/RCTUIManager.h>
-#import <React/RCTUtils.h>
-#import <React/RCTViewManager.h>
+#import "RCTBridge.h"
+#import "RCTBridge+Private.h"
+#import "RCTBridgeModule.h"
+#import "RCTUtils.h"
+#import "RCTUIManager.h"
+#import "RCTViewManager.h"
+#import "RCTJavaScriptExecutor.h"
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \

Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitTests.m

@@ -15,11 +15,11 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <React/RCTBridge+Private.h>
-#import <React/RCTBridge.h>
-#import <React/RCTBridgeModule.h>
-#import <React/RCTJavaScriptExecutor.h>
-#import <React/RCTUtils.h>
+#import "RCTBridge.h"
+#import "RCTBridge+Private.h"
+#import "RCTBridgeModule.h"
+#import "RCTUtils.h"
+#import "RCTJavaScriptExecutor.h"
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \

Examples/UIExplorer/UIExplorerUnitTests/RCTModuleMethodTests.m

@@ -15,9 +15,9 @@
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
-#import <React/RCTBridgeModule.h>
-#import <React/RCTLog.h>
-#import <React/RCTModuleMethod.h>
+#import "RCTBridgeModule.h"
+#import "RCTModuleMethod.h"
+#import "RCTLog.h"
 
 static BOOL RCTLogsError(void (^block)(void))
 {

Examples/UIExplorer/UIExplorerUnitTests/RCTMultipartStreamReaderTests.m

@@ -13,9 +13,8 @@
  */
 
 #import <XCTest/XCTest.h>
-
-#import <React/RCTMultipartStreamReader.h>
-#import <React/RCTUtils.h>
+#import "RCTUtils.h"
+#import "RCTMultipartStreamReader.h"
 
 @interface RCTMultipartStreamReaderTests : XCTestCase
 

Examples/UIExplorer/UIExplorerUnitTests/RCTShadowViewTests.m

@@ -14,8 +14,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import <React/RCTRootShadowView.h>
-#import <React/RCTShadowView.h>
+#import "RCTShadowView.h"
+#import "RCTRootShadowView.h"
 
 
 @interface RCTShadowViewTests : XCTestCase
@@ -28,10 +28,11 @@
 {
   [super setUp];
 
-  self.parentView = [RCTRootShadowView new];
-  YGNodeStyleSetFlexDirection(self.parentView.cssNode, YGFlexDirectionColumn);
-  YGNodeStyleSetWidth(self.parentView.cssNode, 440);
-  YGNodeStyleSetHeight(self.parentView.cssNode, 440);
+  self.parentView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlexDirection(node, CSSFlexDirectionColumn);
+    CSSNodeStyleSetWidth(node, 440);
+    CSSNodeStyleSetHeight(node, 440);
+  }];
   self.parentView.reactTag = @1; // must be valid rootView tag
 }
 
@@ -49,43 +50,43 @@
 //
 - (void)testApplyingLayoutRecursivelyToShadowView
 {
-  RCTShadowView *leftView = [self _shadowViewWithConfig:^(YGNodeRef node) {
-    YGNodeStyleSetFlex(node, 1);
+  RCTShadowView *leftView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlex(node, 1);
   }];
 
-  RCTShadowView *centerView = [self _shadowViewWithConfig:^(YGNodeRef node) {
-    YGNodeStyleSetFlex(node, 2);
-    YGNodeStyleSetMargin(node, YGEdgeLeft, 10);
-    YGNodeStyleSetMargin(node, YGEdgeRight, 10);
+  RCTShadowView *centerView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlex(node, 2);
+    CSSNodeStyleSetMargin(node, CSSEdgeLeft, 10);
+    CSSNodeStyleSetMargin(node, CSSEdgeRight, 10);
   }];
 
-  RCTShadowView *rightView = [self _shadowViewWithConfig:^(YGNodeRef node) {
-    YGNodeStyleSetFlex(node, 1);
+  RCTShadowView *rightView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlex(node, 1);
   }];
 
-  RCTShadowView *mainView = [self _shadowViewWithConfig:^(YGNodeRef node) {
-    YGNodeStyleSetFlexDirection(node, YGFlexDirectionRow);
-    YGNodeStyleSetFlex(node, 2);
-    YGNodeStyleSetMargin(node, YGEdgeTop, 10);
-    YGNodeStyleSetMargin(node, YGEdgeBottom, 10);
+  RCTShadowView *mainView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlexDirection(node, CSSFlexDirectionRow);
+    CSSNodeStyleSetFlex(node, 2);
+    CSSNodeStyleSetMargin(node, CSSEdgeTop, 10);
+    CSSNodeStyleSetMargin(node, CSSEdgeBottom, 10);
   }];
 
   [mainView insertReactSubview:leftView atIndex:0];
   [mainView insertReactSubview:centerView atIndex:1];
   [mainView insertReactSubview:rightView atIndex:2];
 
-  RCTShadowView *headerView = [self _shadowViewWithConfig:^(YGNodeRef node) {
-    YGNodeStyleSetFlex(node, 1);
+  RCTShadowView *headerView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlex(node, 1);
   }];
 
-  RCTShadowView *footerView = [self _shadowViewWithConfig:^(YGNodeRef node) {
-    YGNodeStyleSetFlex(node, 1);
+  RCTShadowView *footerView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlex(node, 1);
   }];
 
-  YGNodeStyleSetPadding(self.parentView.cssNode, YGEdgeLeft, 10);
-  YGNodeStyleSetPadding(self.parentView.cssNode, YGEdgeTop, 10);
-  YGNodeStyleSetPadding(self.parentView.cssNode, YGEdgeRight, 10);
-  YGNodeStyleSetPadding(self.parentView.cssNode, YGEdgeBottom, 10);
+  CSSNodeStyleSetPadding(self.parentView.cssNode, CSSEdgeLeft, 10);
+  CSSNodeStyleSetPadding(self.parentView.cssNode, CSSEdgeTop, 10);
+  CSSNodeStyleSetPadding(self.parentView.cssNode, CSSEdgeRight, 10);
+  CSSNodeStyleSetPadding(self.parentView.cssNode, CSSEdgeBottom, 10);
 
   [self.parentView insertReactSubview:headerView atIndex:0];
   [self.parentView insertReactSubview:mainView atIndex:1];
@@ -107,18 +108,18 @@
 
 - (void)testAncestorCheck
 {
-  RCTShadowView *centerView = [self _shadowViewWithConfig:^(YGNodeRef node) {
-    YGNodeStyleSetFlex(node, 1);
+  RCTShadowView *centerView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlex(node, 1);
   }];
 
-  RCTShadowView *mainView = [self _shadowViewWithConfig:^(YGNodeRef node) {
-    YGNodeStyleSetFlex(node, 1);
+  RCTShadowView *mainView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlex(node, 1);
   }];
 
   [mainView insertReactSubview:centerView atIndex:0];
 
-  RCTShadowView *footerView = [self _shadowViewWithConfig:^(YGNodeRef node) {
-    YGNodeStyleSetFlex(node, 1);
+  RCTShadowView *footerView = [self _shadowViewWithConfig:^(CSSNodeRef node) {
+    CSSNodeStyleSetFlex(node, 1);
   }];
 
   [self.parentView insertReactSubview:mainView atIndex:0];
@@ -130,11 +131,10 @@
 
 - (void)testAssignsSuggestedWidthDimension
 {
-  [self _withShadowViewWithStyle:^(YGNodeRef node) {
-                                   YGNodeStyleSetPositionType(node, YGPositionTypeAbsolute);
-                                   YGNodeStyleSetPosition(node, YGEdgeLeft, 0);
-                                   YGNodeStyleSetPosition(node, YGEdgeTop, 0);
-                                   YGNodeStyleSetHeight(node, 10);
+  [self _withShadowViewWithStyle:^(CSSNodeRef node) {
+                                   CSSNodeStyleSetPosition(node, CSSEdgeLeft, 0);
+                                   CSSNodeStyleSetPosition(node, CSSEdgeTop, 0);
+                                   CSSNodeStyleSetHeight(node, 10);
                                  }
             assertRelativeLayout:CGRectMake(0, 0, 3, 10)
         withIntrinsicContentSize:CGSizeMake(3, UIViewNoIntrinsicMetric)];
@@ -142,11 +142,10 @@
 
 - (void)testAssignsSuggestedHeightDimension
 {
-  [self _withShadowViewWithStyle:^(YGNodeRef node) {
-                                   YGNodeStyleSetPositionType(node, YGPositionTypeAbsolute);
-                                   YGNodeStyleSetPosition(node, YGEdgeLeft, 0);
-                                   YGNodeStyleSetPosition(node, YGEdgeTop, 0);
-                                   YGNodeStyleSetWidth(node, 10);
+  [self _withShadowViewWithStyle:^(CSSNodeRef node) {
+                                   CSSNodeStyleSetPosition(node, CSSEdgeLeft, 0);
+                                   CSSNodeStyleSetPosition(node, CSSEdgeTop, 0);
+                                   CSSNodeStyleSetWidth(node, 10);
                                  }
             assertRelativeLayout:CGRectMake(0, 0, 10, 4)
         withIntrinsicContentSize:CGSizeMake(UIViewNoIntrinsicMetric, 4)];
@@ -154,12 +153,11 @@
 
 - (void)testDoesNotOverrideDimensionStyleWithSuggestedDimensions
 {
-  [self _withShadowViewWithStyle:^(YGNodeRef node) {
-                                   YGNodeStyleSetPositionType(node, YGPositionTypeAbsolute);
-                                   YGNodeStyleSetPosition(node, YGEdgeLeft, 0);
-                                   YGNodeStyleSetPosition(node, YGEdgeTop, 0);
-                                   YGNodeStyleSetWidth(node, 10);
-                                   YGNodeStyleSetHeight(node, 10);
+  [self _withShadowViewWithStyle:^(CSSNodeRef node) {
+                                   CSSNodeStyleSetPosition(node, CSSEdgeLeft, 0);
+                                   CSSNodeStyleSetPosition(node, CSSEdgeTop, 0);
+                                   CSSNodeStyleSetWidth(node, 10);
+                                   CSSNodeStyleSetHeight(node, 10);
                                  }
           assertRelativeLayout:CGRectMake(0, 0, 10, 10)
       withIntrinsicContentSize:CGSizeMake(3, 4)];
@@ -167,16 +165,16 @@
 
 - (void)testDoesNotAssignSuggestedDimensionsWhenStyledWithFlexAttribute
 {
-  float parentWidth = YGNodeStyleGetWidth(self.parentView.cssNode).value;
-  float parentHeight = YGNodeStyleGetHeight(self.parentView.cssNode).value;
-  [self _withShadowViewWithStyle:^(YGNodeRef node) {
-                                   YGNodeStyleSetFlex(node, 1);
+  float parentWidth = CSSNodeStyleGetWidth(self.parentView.cssNode);
+  float parentHeight = CSSNodeStyleGetHeight(self.parentView.cssNode);
+  [self _withShadowViewWithStyle:^(CSSNodeRef node) {
+                                   CSSNodeStyleSetFlex(node, 1);
                                  }
             assertRelativeLayout:CGRectMake(0, 0, parentWidth, parentHeight)
         withIntrinsicContentSize:CGSizeMake(3, 4)];
 }
 
-- (void)_withShadowViewWithStyle:(void(^)(YGNodeRef node))configBlock
+- (void)_withShadowViewWithStyle:(void(^)(CSSNodeRef node))configBlock
             assertRelativeLayout:(CGRect)expectedRect
         withIntrinsicContentSize:(CGSize)contentSize
 {
@@ -191,12 +189,11 @@
                 NSStringFromCGRect(actualRect));
 }
 
-- (RCTShadowView *)_shadowViewWithConfig:(void(^)(YGNodeRef node))configBlock
+- (RCTRootShadowView *)_shadowViewWithConfig:(void(^)(CSSNodeRef node))configBlock
 {
-  RCTShadowView *shadowView = [RCTShadowView new];
+  RCTRootShadowView *shadowView = [RCTRootShadowView new];
   configBlock(shadowView.cssNode);
   return shadowView;
 }
 
-
 @end

Examples/UIExplorer/UIExplorerUnitTests/RCTUIManagerTests.m

@@ -14,8 +14,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import <React/RCTUIManager.h>
-#import <React/UIView+React.h>
+#import "RCTUIManager.h"
+#import "UIView+React.h"
 
 @interface RCTUIManager (Testing)
 

Examples/UIExplorer/UIExplorerUnitTests/RCTURLUtilsTests.m

@@ -13,8 +13,7 @@
  */
 
 #import <XCTest/XCTest.h>
-
-#import <React/RCTUtils.h>
+#import "RCTUtils.h"
 
 @interface RCTURLUtilsTests : XCTestCase
 

Examples/UIExplorer/UIExplorerUnitTests/RCTUnicodeDecodeTests.m

@@ -14,13 +14,13 @@
 
 #import <XCTest/XCTest.h>
 
-#import <React/RCTNetworking.h>
+#import "RCTNetworking.h"
 
-static NSString *const niqqudStringB64 = @"15HWsNa816jWtdeQ16nWtNeB15nXqiwg15HWuNa816jWuNeQINeQ1rHXnNa515TWtNeZ150sINeQ1rXXqiDXlNa316nWuNa814HXnta315nWtNedLCDXldaw15DWtdeqINeU1rjXkNa416jWttelLg==";
+static NSString* const niqqudStringB64 = @"15HWsNa816jWtdeQ16nWtNeB15nXqiwg15HWuNa816jWuNeQINeQ1rHXnNa515TWtNeZ150sINeQ1rXXqiDXlNa316nWuNa814HXnta315nWtNedLCDXldaw15DWtdeqINeU1rjXkNa416jWttelLg==";
 
 @interface RCTNetworking ()
 
-+ (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)response withCarryData:(NSMutableData *)inputCarryData;
++ (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)response withCarryData:(NSMutableData*)inputCarryData;
 
 @end
 
@@ -30,47 +30,47 @@ static NSString *const niqqudStringB64 = @"15HWsNa816jWtdeQ16nWtNeB15nXqiwg15HWu
 
 @implementation RCTUnicodeDecodeTests
 
-- (void)runTestForString:(NSString *)unicodeString usingEncoding:(NSString *)encodingName cutAt:(NSUInteger)cutPoint
+- (void)runTestForString:(NSString*)unicodeString usingEncoding:(NSString*)encodingName cutAt:(NSUInteger)cutPoint
 {
   CFStringEncoding cfEncoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)encodingName);
   NSStringEncoding encoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding);
-
-  NSData *unicodeBytes = [unicodeString dataUsingEncoding:encoding];
-
-  NSURLResponse *fakeResponse = [[NSHTTPURLResponse alloc] initWithURL:[NSURL URLWithString:@"testurl://"]
+  
+  NSData* unicodeBytes = [unicodeString dataUsingEncoding:encoding];
+  
+  NSURLResponse* fakeResponse = [[NSHTTPURLResponse alloc] initWithURL:[NSURL URLWithString:@"testurl://"]
                                                             statusCode:200
                                                            HTTPVersion:@"1.1"
                                                           headerFields:@{@"content-type": [NSString stringWithFormat:@"text/plain; charset=%@", encodingName]}];
   XCTAssert([fakeResponse.textEncodingName isEqualToString:encodingName]);
-
-  NSMutableData *carryStorage = [NSMutableData new];
-  NSMutableString *parsedString = [NSMutableString new];
-
+  
+  NSMutableData* carryStorage = [NSMutableData new];
+  NSMutableString* parsedString = [NSMutableString new];
+  
   [parsedString appendString:[RCTNetworking decodeTextData:[unicodeBytes subdataWithRange:NSMakeRange(0, cutPoint)]
                                               fromResponse:fakeResponse
                                              withCarryData:carryStorage] ?: @""];
-
+  
   [parsedString appendString:[RCTNetworking decodeTextData:[unicodeBytes subdataWithRange:NSMakeRange(cutPoint, unicodeBytes.length - cutPoint)]
                                               fromResponse:fakeResponse
                                              withCarryData:carryStorage] ?: @""];
-
+  
   XCTAssert(carryStorage.length == 0);
   XCTAssert([parsedString isEqualToString:unicodeString]);
 }
 
 - (void)testNiqqud
 {
-  NSString *unicodeString = [[NSString alloc] initWithData:[[NSData alloc] initWithBase64EncodedString:niqqudStringB64
+  NSString* unicodeString = [[NSString alloc] initWithData:[[NSData alloc] initWithBase64EncodedString:niqqudStringB64
                                                                                                options:(NSDataBase64DecodingOptions)0]
                                                   encoding:NSUTF8StringEncoding];
-
+  
   [self runTestForString:unicodeString usingEncoding:@"utf-8" cutAt:25];
 }
 
 - (void)testEmojis
 {
-  NSString *unicodeString = @"\U0001F602\U0001F602";
-
+  NSString* unicodeString = @"\U0001F602\U0001F602";
+  
   [self runTestForString:unicodeString usingEncoding:@"utf-8" cutAt:7];
 }
 

Examples/UIExplorer/UIExplorerUnitTests/TestBundle.js

@@ -6,9 +6,8 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  */
-'use strict';
 
-const __fbBatchedBridge = { // eslint-disable-line no-unused-vars
+var __fbBatchedBridge = {
   flushedQueue: function() {
     return null;
   }

Examples/UIExplorer/android/app/BUCK

@@ -16,9 +16,9 @@ android_library(
     ':res',
     react_native_dep('third-party/android/support/v4:lib-support-v4'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
-    react_native_target('java/com/facebook/react:react'),
     react_native_target('java/com/facebook/react/modules/core:core'),
     react_native_target('java/com/facebook/react/shell:shell'),
+    react_native_target('java/com/facebook/react:react'),
     react_native_target('jni/prebuilt:android-jsc'),
     # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
     react_native_target('jni/prebuilt:reactnative-libs'),

Examples/UIExplorer/android/app/build.gradle

@@ -89,7 +89,7 @@ android {
     defaultConfig {
         applicationId "com.facebook.react.uiapp"
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 22
         versionCode 1
         versionName "1.0"
         ndk {

Examples/UIExplorer/android/app/src/main/AndroidManifest.xml

@@ -11,10 +11,6 @@
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
 
-  <!--Just to show permissions example-->
-  <uses-permission android:name="android.permission.CAMERA"/>
-  <uses-permission android:name="android.permission.READ_CALENDAR"/>
-
   <uses-sdk
     android:minSdkVersion="16"
     android:targetSdkVersion="23" />

Examples/UIExplorer/js/ActionSheetIOSExample.js

@@ -131,9 +131,9 @@ class ShareActionSheetExample extends React.Component {
       ]
     },
     (error) => alert(error),
-    (completed, method) => {
+    (success, method) => {
       var text;
-      if (completed) {
+      if (success) {
         text = `Shared via ${method}`;
       } else {
         text = 'You didn\'t share';
@@ -172,9 +172,9 @@ class ShareScreenshotExample extends React.Component {
         ]
       },
       (error) => alert(error),
-      (completed, method) => {
+      (success, method) => {
         var text;
-        if (completed) {
+        if (success) {
           text = `Shared via ${method}`;
         } else {
           text = 'You didn\'t share';

Examples/UIExplorer/js/AlertIOSExample.js

@@ -144,17 +144,6 @@ class PromptOptions extends React.Component {
           </View>
         </TouchableHighlight>
 
-        <TouchableHighlight
-          style={styles.wrapper}
-          onPress={() => AlertIOS.prompt('Type a phone number', null, null, 'plain-text', undefined, 'phone-pad')}>
-
-          <View style={styles.button}>
-            <Text>
-              prompt with title & custom keyboard
-            </Text>
-          </View>
-        </TouchableHighlight>
-
         <TouchableHighlight
           style={styles.wrapper}
           onPress={() => AlertIOS.prompt('Type a value', null, this.saveResponse, undefined, 'Default value')}>

Examples/UIExplorer/js/AnimatedGratuitousApp/AnExApp.js

@@ -83,7 +83,6 @@ class Circle extends React.Component {
           y: gestureState.dy + this.props.restLayout.y,
         });
         this.props.onDeactivate();
-        this.state.pan.removeAllListeners();
       },
     })}, () => {
       this.props.onActivate();

Examples/UIExplorer/js/AnimatedGratuitousApp/AnExScroll.js

@@ -69,27 +69,18 @@ class AnExScroll extends React.Component {
         <Animated.Image
           pointerEvents="none"
           style={[styles.bunny, {transform: [
-            {
-              translateX: this.state.scrollX.interpolate({
-                inputRange: [0, width, 2 * width],
-                outputRange: [0, 0, width / 3],
-                extrapolate: 'clamp',
-              }),
-            },
-            {
-              translateY: this.state.scrollX.interpolate({
-                inputRange: [0, width, 2 * width],
-                outputRange: [0, -200, -260],
-                extrapolate: 'clamp',
-              }),
-            },
-            {
-              scale: this.state.scrollX.interpolate({
-                inputRange: [0, width, 2 * width],
-                outputRange: [0.5, 0.5, 2],
-                extrapolate: 'clamp',
-              }),
-            },
+            {translateX: this.state.scrollX.interpolate({
+              inputRange: [0, width, 2 * width],
+              outputRange: [0, 0, width / 3]}),          //  multi-part ranges
+              extrapolate: 'clamp'},                     //  default is 'extend'
+            {translateY: this.state.scrollX.interpolate({
+              inputRange: [0, width, 2 * width],
+              outputRange: [0, -200, -260]}),
+              extrapolate: 'clamp'},
+            {scale: this.state.scrollX.interpolate({
+              inputRange: [0, width, 2 * width],
+              outputRange: [0.5, 0.5, 2]}),
+              extrapolate: 'clamp'},
           ]}]}
           source={BUNNY_PIC}
         />

Examples/UIExplorer/js/DatePickerAndroidExample.js

@@ -38,15 +38,8 @@ class DatePickerAndroidExample extends React.Component {
 
   state = {
     presetDate: new Date(2020, 4, 5),
-    simpleDate: new Date(2020, 4, 5),
-    spinnerDate: new Date(2020, 4, 5),
-    calendarDate: new Date(2020, 4, 5),
-    defaultDate: new Date(2020, 4, 5),
     allDate: new Date(2020, 4, 5),
     simpleText: 'pick a date',
-    spinnerText: 'pick a date',
-    calendarText: 'pick a date',
-    defaultText: 'pick a date',
     minText: 'pick a date, no earlier than today',
     maxText: 'pick a date, no later than today',
     presetText: 'pick a date, preset to 2020/5/5',
@@ -79,24 +72,6 @@ class DatePickerAndroidExample extends React.Component {
             <Text style={styles.text}>{this.state.simpleText}</Text>
           </TouchableWithoutFeedback>
         </UIExplorerBlock>
-        <UIExplorerBlock title="Simple spinner date picker">
-          <TouchableWithoutFeedback
-            onPress={this.showPicker.bind(this, 'spinner', {date: this.state.spinnerDate, mode: 'spinner'})}>
-            <Text style={styles.text}>{this.state.spinnerText}</Text>
-          </TouchableWithoutFeedback>
-        </UIExplorerBlock>
-        <UIExplorerBlock title="Simple calendar date picker">
-          <TouchableWithoutFeedback
-            onPress={this.showPicker.bind(this, 'calendar', {date: this.state.calendarDate, mode: 'calendar'})}>
-            <Text style={styles.text}>{this.state.calendarText}</Text>
-          </TouchableWithoutFeedback>
-        </UIExplorerBlock>
-        <UIExplorerBlock title="Simple default date picker">
-          <TouchableWithoutFeedback
-            onPress={this.showPicker.bind(this, 'default', {date: this.state.defaultDate, mode: 'default'})}>
-            <Text style={styles.text}>{this.state.defaultText}</Text>
-          </TouchableWithoutFeedback>
-        </UIExplorerBlock>
         <UIExplorerBlock title="Date picker with pre-set date">
           <TouchableWithoutFeedback
             onPress={this.showPicker.bind(this, 'preset', {date: this.state.presetDate})}>

Examples/UIExplorer/js/ImageCapInsetsExample.js

@@ -25,8 +25,6 @@
 
 var React = require('react');
 var ReactNative = require('react-native');
-
-var nativeImageSource = require('nativeImageSource');
 var {
   Image,
   StyleSheet,
@@ -43,11 +41,7 @@ class ImageCapInsetsExample extends React.Component {
             capInsets: none
           </Text>
           <Image
-            source={nativeImageSource({
-              ios: 'story-background',
-              width: 60,
-              height: 60
-            })}
+            source={require('image!story-background')}
             style={styles.storyBackground}
             resizeMode={Image.resizeMode.stretch}
             capInsets={{left: 0, right: 0, bottom: 0, top: 0}}
@@ -58,11 +52,7 @@ class ImageCapInsetsExample extends React.Component {
             capInsets: 15
           </Text>
           <Image
-            source={nativeImageSource({
-              ios: 'story-background',
-              width: 60,
-              height: 60
-            })}
+            source={require('image!story-background')}
             style={styles.storyBackground}
             resizeMode={Image.resizeMode.stretch}
             capInsets={{left: 15, right: 15, bottom: 15, top: 15}}

Examples/UIExplorer/js/ImageExample.js

@@ -36,7 +36,7 @@ var {
 var base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAQAAACSR7JhAAADtUlEQVR4Ac3YA2Bj6QLH0XPT1Fzbtm29tW3btm3bfLZtv7e2ObZnms7d8Uw098tuetPzrxv8wiISrtVudrG2JXQZ4VOv+qUfmqCGGl1mqLhoA52oZlb0mrjsnhKpgeUNEs91Z0pd1kvihA3ULGVHiQO2narKSHKkEMulm9VgUyE60s1aWoMQUbpZOWE+kaqs4eLEjdIlZTcFZB0ndc1+lhB1lZrIuk5P2aib1NBpZaL+JaOGIt0ls47SKzLC7CqrlGF6RZ09HGoNy1lYl2aRSWL5GuzqWU1KafRdoRp0iOQEiDzgZPnG6DbldcomadViflnl/cL93tOoVbsOLVM2jylvdWjXolWX1hmfZbGR/wjypDjFLSZIRov09BgYmtUqPQPlQrPapecLgTIy0jMgPKtTeob2zWtrGH3xvjUkPCtNg/tm1rjwrMa+mdUkPd3hWbH0jArPGiU9ufCsNNWFZ40wpwn+62/66R2RUtoso1OB34tnLOcy7YB1fUdc9e0q3yru8PGM773vXsuZ5YIZX+5xmHwHGVvlrGPN6ZSiP1smOsMMde40wKv2VmwPPVXNut4sVpUreZiLBHi0qln/VQeI/LTMYXpsJtFiclUN+5HVZazim+Ky+7sAvxWnvjXrJFneVtLWLyPJu9K3cXLWeOlbMTlrIelbMDlrLenrjEQOtIF+fuI9xRp9ZBFp6+b6WT8RrxEpdK64BuvHgDk+vUy+b5hYk6zfyfs051gRoNO1usU12WWRWL73/MMEy9pMi9qIrR4ZpV16Rrvduxazmy1FSvuFXRkqTnE7m2kdb5U8xGjLw/spRr1uTov4uOgQE+0N/DvFrG/Jt7i/FzwxbA9kDanhf2w+t4V97G8lrT7wc08aA2QNUkuTfW/KimT01wdlfK4yEw030VfT0RtZbzjeMprNq8m8tnSTASrTLti64oBNdpmMQm0eEwvfPwRbUBywG5TzjPCsdwk3IeAXjQblLCoXnDVeoAz6SfJNk5TTzytCNZk/POtTSV40NwOFWzw86wNJRpubpXsn60NJFlHeqlYRbslqZm2jnEZ3qcSKgm0kTli3zZVS7y/iivZTweYXJ26Y+RTbV1zh3hYkgyFGSTKPfRVbRqWWVReaxYeSLarYv1Qqsmh1s95S7G+eEWK0f3jYKTbV6bOwepjfhtafsvUsqrQvrGC8YhmnO9cSCk3yuY984F1vesdHYhWJ5FvASlacshUsajFt2mUM9pqzvKGcyNJW0arTKN1GGGzQlH0tXwLDgQTurS8eIQAAAABJRU5ErkJggg==';
 
 var ImageCapInsetsExample = require('./ImageCapInsetsExample');
-const IMAGE_PREFETCH_URL = 'http://origami.design/public/images/bird-logo.png?r=1&t=' + Date.now();
+const IMAGE_PREFETCH_URL = 'https://facebook.github.io/origami/public/images/blog-hero.jpg?r=1&t=' + Date.now();
 var prefetchTask = Image.prefetch(IMAGE_PREFETCH_URL);
 
 var NetworkImageCallbackExample = React.createClass({
@@ -267,7 +267,7 @@ exports.examples = [
     title: 'Image Loading Events',
     render: function() {
       return (
-        <NetworkImageCallbackExample source={{uri: 'http://origami.design/public/images/bird-logo.png?r=1&t=' + Date.now()}}
+        <NetworkImageCallbackExample source={{uri: 'https://facebook.github.io/origami/public/images/blog-hero.jpg?r=1&t=' + Date.now()}}
           prefetchedSource={{uri: IMAGE_PREFETCH_URL}}/>
       );
     },
@@ -285,7 +285,7 @@ exports.examples = [
     title: 'Image Download Progress',
     render: function() {
       return (
-        <NetworkImageExample source={{uri: 'http://origami.design/public/images/bird-logo.png?r=1'}}/>
+        <NetworkImageExample source={{uri: 'https://facebook.github.io/origami/public/images/blog-hero.jpg?r=1'}}/>
       );
     },
     platform: 'ios',
@@ -304,35 +304,6 @@ exports.examples = [
     },
     platform: 'ios',
   },
-  {
-    title: 'Cache Policy',
-    description: 'First image has never been loaded before and is instructed not to load unless in cache.' +
-    'Placeholder image from above will stay. Second image is the same but forced to load regardless of' +
-    ' local cache state.',
-    render: function () {
-      return (
-        <View style={styles.horizontal}>
-          <Image
-            defaultSource={require('./bunny.png')}
-            source={{
-              uri: smallImage.uri + '?cacheBust=notinCache' + Date.now(),
-              cache: 'only-if-cached'
-            }}
-            style={styles.base}
-          />
-          <Image
-            defaultSource={require('./bunny.png')}
-            source={{
-              uri: smallImage.uri + '?cacheBust=notinCache' + Date.now(),
-              cache: 'reload'
-            }}
-            style={styles.base}
-          />
-        </View>
-      );
-    },
-    platform: 'ios',
-  },
   {
     title: 'Border Color',
     render: function() {
@@ -641,7 +612,7 @@ exports.examples = [
     render: function() {
       return (
         <Image
-          source={{uri: 'legacy_image', width: 120, height: 120}}
+          source={require('image!legacy_image')}
         />
       );
     },

Examples/UIExplorer/js/ListViewExample.js

@@ -29,6 +29,7 @@ var {
   ListView,
   TouchableHighlight,
   StyleSheet,
+  RecyclerViewBackedScrollView,
   Text,
   View,
 } = ReactNative;
@@ -63,6 +64,7 @@ var ListViewSimpleExample = React.createClass({
         <ListView
           dataSource={this.state.dataSource}
           renderRow={this._renderRow}
+          renderScrollComponent={props => <RecyclerViewBackedScrollView {...props} />}
           renderSeparator={this._renderSeparator}
         />
       </UIExplorerPage>

Examples/UIExplorer/js/MapViewExample.js

@@ -242,7 +242,6 @@ class AnnotationExample extends React.Component {
 
     return (
       <MapView
-        showsAnnotationCallouts={this.props.showsAnnotationCallouts}
         style={styles.map}
         onRegionChangeComplete={onRegionChangeComplete}
         region={this.state.mapRegion}
@@ -367,29 +366,6 @@ exports.examples = [
       }}/>;
     }
   },
-  {
-    title: 'Show callouts by default example',
-    render() {
-      return <AnnotationExample
-        style={styles.map}
-        annotation={{
-          title: 'More Info...',
-          rightCalloutView: (
-            <TouchableOpacity
-              onPress={() => {
-                alert('You Are Here');
-              }}>
-              <Image
-                style={{width:30, height:30}}
-                source={require('./uie_thumb_selected.png')}
-              />
-            </TouchableOpacity>
-          ),
-        }}
-        showsAnnotationCallouts={true}
-      />;
-    }
-  },
   {
     title: 'Annotation focus example',
     render() {

Examples/UIExplorer/js/NativeAnimationsExample.js

@@ -30,11 +30,8 @@ const {
   Animated,
   StyleSheet,
   TouchableWithoutFeedback,
-  Slider,
 } = ReactNative;
 
-var AnimatedSlider = Animated.createAnimatedComponent(Slider);
-
 class Tester extends React.Component {
   state = {
     native: new Animated.Value(0),
@@ -231,6 +228,7 @@ exports.description = 'Test out Native Animations';
 exports.examples = [
 {
     title: 'Multistage With Multiply and rotation',
+    description: 'description',
     render: function() {
       return (
           <Tester
@@ -280,6 +278,7 @@ exports.examples = [
   },
   {
     title: 'Multistage With Multiply',
+    description: 'description',
     render: function() {
       return (
           <Tester
@@ -323,6 +322,7 @@ exports.examples = [
   },
   {
     title: 'Scale interpolation with clamping',
+    description: 'description',
     render: function() {
       return (
         <Tester
@@ -352,6 +352,7 @@ exports.examples = [
   },
   {
     title: 'Opacity without interpolation',
+    description: 'description',
     render: function() {
       return (
         <Tester
@@ -373,6 +374,7 @@ exports.examples = [
   },
   {
     title: 'Rotate interpolation',
+    description: 'description',
     render: function() {
       return (
         <Tester
@@ -401,6 +403,7 @@ exports.examples = [
   },
   {
     title: 'translateX => Animated.spring',
+    description: 'description',
     render: function() {
       return (
         <Tester
@@ -451,19 +454,6 @@ exports.examples = [
         </Tester>
       );
     },
-  },{
-    title: 'Drive custom property',
-    render: function() {
-      return (
-        <Tester
-          type="timing"
-          config={{ duration: 1000 }}>
-          {anim => (
-            <AnimatedSlider style={{}} value={anim} />
-          )}
-        </Tester>
-      );
-    },
   },
   {
     title: 'Animated value listener',

Examples/UIExplorer/js/Navigator/JumpingNavSample.js

@@ -22,8 +22,6 @@
 
 var React = require('react');
 var ReactNative = require('react-native');
-
-var nativeImageSource = require('nativeImageSource');
 var {
   Navigator,
   StyleSheet,
@@ -76,11 +74,7 @@ class JumpingNavBar extends React.Component {
       <View style={styles.tabs}>
         <TabBarIOS>
           <TabBarIOS.Item
-            icon={nativeImageSource({
-              ios: 'tabnav_notification',
-              width: 24,
-              height: 24
-            })}
+            icon={require('image!tabnav_notification')}
             selected={this.state.tabIndex === 0}
             onPress={() => {
               this.props.onTabIndex(0);
@@ -89,11 +83,7 @@ class JumpingNavBar extends React.Component {
             <View />
           </TabBarIOS.Item>
           <TabBarIOS.Item
-            icon={nativeImageSource({
-              ios: 'tabnav_list',
-              width: 24,
-              height: 24
-            })}
+            icon={require('image!tabnav_list')}
             selected={this.state.tabIndex === 1}
             onPress={() => {
               this.props.onTabIndex(1);
@@ -102,11 +92,7 @@ class JumpingNavBar extends React.Component {
             <View />
           </TabBarIOS.Item>
           <TabBarIOS.Item
-            icon={nativeImageSource({
-              ios: 'tabnav_settings',
-              width: 24,
-              height: 24
-            })}
+            icon={require('image!tabnav_settings')}
             selected={this.state.tabIndex === 2}
             onPress={() => {
               this.props.onTabIndex(2);

Examples/UIExplorer/js/NavigatorIOSExample.js

@@ -25,9 +25,7 @@
 const React = require('react');
 const ReactNative = require('react-native');
 const ViewExample = require('./ViewExample');
-
 const createExamplePage = require('./createExamplePage');
-const nativeImageSource = require('nativeImageSource');
 const {
   AlertIOS,
   NavigatorIOS,
@@ -109,11 +107,7 @@ class NavigatorIOSExamplePage extends React.Component {
               component: EmptyPage,
               leftButtonTitle: 'Custom Left',
               onLeftButtonPress: () => this.props.navigator.pop(),
-              rightButtonIcon: nativeImageSource({
-                ios: 'NavBarButtonPlus',
-                width: 17,
-                height: 17
-              }),
+              rightButtonIcon: require('image!NavBarButtonPlus'),
               onRightButtonPress: () => {
                 AlertIOS.alert(
                   'Bar Button Action',

Examples/UIExplorer/js/PermissionsExampleAndroid.android.js

@@ -27,15 +27,13 @@ const React = require('react');
 const ReactNative = require('react-native');
 const {
   PermissionsAndroid,
-  Picker,
   StyleSheet,
   Text,
+  TextInput,
   TouchableWithoutFeedback,
   View,
 } = ReactNative;
 
-const Item = Picker.Item;
-
 exports.displayName = (undefined: ?string);
 exports.framework = 'React';
 exports.title = 'PermissionsAndroid';
@@ -43,7 +41,7 @@ exports.description = 'Permissions example for API 23+.';
 
 class PermissionsExample extends React.Component {
   state = {
-    permission: PermissionsAndroid.PERMISSIONS.CAMERA,
+    permission: PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
     hasPermission: 'Not Checked',
   };
 
@@ -51,14 +49,13 @@ class PermissionsExample extends React.Component {
     return (
       <View style={styles.container}>
         <Text style={styles.text}>Permission Name:</Text>
-        <Picker
-          style={styles.picker}
-          selectedValue={this.state.permission}
-          onValueChange={this._onSelectPermission.bind(this)}>
-          <Item label={PermissionsAndroid.PERMISSIONS.CAMERA} value={PermissionsAndroid.PERMISSIONS.CAMERA} />
-          <Item label={PermissionsAndroid.PERMISSIONS.READ_CALENDAR} value={PermissionsAndroid.PERMISSIONS.READ_CALENDAR} />
-          <Item label={PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION} value={PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION} />
-        </Picker>
+        <TextInput
+          autoFocus={true}
+          autoCorrect={false}
+          style={styles.singleLine}
+          onChange={this._updateText}
+          defaultValue={this.state.permission}
+        />
         <TouchableWithoutFeedback onPress={this._checkPermission}>
           <View>
             <Text style={[styles.touchable, styles.text]}>Check Permission</Text>
@@ -74,14 +71,14 @@ class PermissionsExample extends React.Component {
     );
   }
 
-  _onSelectPermission = (permission: string) => {
+  _updateText = (event: Object) => {
     this.setState({
-      permission: permission,
+      permission: event.nativeEvent.text,
     });
   };
 
   _checkPermission = async () => {
-    let result = await PermissionsAndroid.check(this.state.permission);
+    let result = await PermissionsAndroid.checkPermission(this.state.permission);
     this.setState({
       hasPermission: (result ? 'Granted' : 'Revoked') + ' for ' +
         this.state.permission,
@@ -89,7 +86,7 @@ class PermissionsExample extends React.Component {
   };
 
   _requestPermission = async () => {
-    let result = await PermissionsAndroid.request(
+    let result = await PermissionsAndroid.requestPermission(
       this.state.permission,
       {
         title: 'Permission Explanation',
@@ -98,9 +95,8 @@ class PermissionsExample extends React.Component {
           ' because of reasons. Please approve.'
       },
     );
-
     this.setState({
-      hasPermission: result + ' for ' +
+      hasPermission: (result ? 'Granted' : 'Revoked') + ' for ' +
         this.state.permission,
     });
   };
@@ -129,7 +125,4 @@ var styles = StyleSheet.create({
   touchable: {
     color: '#007AFF',
   },
-  picker: {
-    flex: 1,
-  }
 });

Examples/UIExplorer/js/ScrollViewExample.js

@@ -57,11 +57,6 @@ exports.examples = [
           onPress={() => { _scrollView.scrollTo({y: 0}); }}>
           <Text>Scroll to top</Text>
         </TouchableOpacity>
-        <TouchableOpacity
-          style={styles.button}
-          onPress={() => { _scrollView.scrollToEnd({animated: true}); }}>
-          <Text>Scroll to bottom</Text>
-        </TouchableOpacity>
       </View>
     );
   }
@@ -84,11 +79,6 @@ exports.examples = [
           onPress={() => { _scrollView.scrollTo({x: 0}); }}>
           <Text>Scroll to start</Text>
         </TouchableOpacity>
-        <TouchableOpacity
-          style={styles.button}
-          onPress={() => { _scrollView.scrollToEnd({animated: true}); }}>
-          <Text>Scroll to end</Text>
-        </TouchableOpacity>
       </View>
     );
   }

Examples/UIExplorer/js/SliderExample.js

@@ -132,23 +132,16 @@ exports.examples = [
   },
   {
     title: 'Custom min/max track tint color',
+    platform: 'ios',
     render(): React.Element<any> {
       return (
         <SliderExample
-          minimumTrackTintColor={'blue'}
-          maximumTrackTintColor={'red'}
-          value={0.5}
+          minimumTrackTintColor={'red'}
+          maximumTrackTintColor={'green'}
         />
       );
     }
   },
-  {
-    title: 'Custom thumb color',
-    platform: 'android',
-    render(): React.Element<any> {
-      return <SliderExample thumbTintColor={'blue'} />;
-    }
-  },
   {
     title: 'Custom thumb image',
     platform: 'ios',

Examples/UIExplorer/js/SwipeableListViewExample.js

@@ -29,6 +29,7 @@ var {
   SwipeableListView,
   TouchableHighlight,
   StyleSheet,
+  RecyclerViewBackedScrollView,
   Text,
   View,
   Alert,
@@ -75,6 +76,7 @@ var SwipeableListViewSimpleExample = React.createClass({
             </View>);
           }}
           renderRow={this._renderRow}
+          renderScrollComponent={props => <RecyclerViewBackedScrollView {...props} />}
           renderSeparator={this._renderSeperator}
         />
       </UIExplorerPage>

Examples/UIExplorer/js/SwitchExample.js

@@ -147,13 +147,16 @@ var examples = [
   {
     title: 'Switches are controlled components',
     render(): React.Element<any> { return <Switch />; }
-  },
-  {
-    title: 'Custom colors can be provided',
-    render(): React.Element<any> { return <ColorSwitchExample />; }
   }
 ];
 
+if (Platform.OS === 'ios') {
+  examples.push({
+    title: 'Custom colors can be provided',
+    render(): React.Element<any> { return <ColorSwitchExample />; }
+  });
+}
+
 exports.title = '<Switch>';
 exports.displayName = 'SwitchExample';
 exports.description = 'Native boolean input';

Examples/UIExplorer/js/TabBarIOSExample.js

@@ -58,7 +58,6 @@ class TabBarExample extends React.Component {
       <TabBarIOS
         unselectedTintColor="yellow"
         tintColor="white"
-        unselectedItemTintColor="red"
         barTintColor="darkslateblue">
         <TabBarIOS.Item
           title="Blue Tab"
@@ -74,7 +73,6 @@ class TabBarExample extends React.Component {
         <TabBarIOS.Item
           systemIcon="history"
           badge={this.state.notifCount > 0 ? this.state.notifCount : undefined}
-          badgeColor="black"
           selected={this.state.selectedTab === 'redTab'}
           onPress={() => {
             this.setState({

Examples/UIExplorer/js/TextExample.android.js

@@ -386,15 +386,10 @@ class TextExample extends React.Component {
           </Text>
         </UIExplorerBlock>
         <UIExplorerBlock title="selectable attribute">
-          <Text selectable>
+          <Text selectable={true}>
             This text is selectable if you click-and-hold, and will offer the native Android selection menus.
           </Text>
         </UIExplorerBlock>
-        <UIExplorerBlock title="selectionColor attribute">
-          <Text selectable selectionColor="orange">
-            This text will have a orange highlight on selection.
-          </Text>
-        </UIExplorerBlock>
         <UIExplorerBlock title="Inline images">
           <Text>
             This text contains an inline image <Image source={require('./flux.png')}/>. Neat, huh?
@@ -416,23 +411,6 @@ class TextExample extends React.Component {
             This very long text should be truncated with dots in the beginning.
           </Text>
         </UIExplorerBlock>
-        <UIExplorerBlock title="Include Font Padding">
-          <View style={{flexDirection: 'row', justifyContent: 'space-around', marginBottom: 10}}>
-            <View style={{alignItems: 'center'}}>
-              <Text style={styles.includeFontPaddingText}>
-                Ey
-              </Text>
-              <Text>Default</Text>
-            </View>
-            <View style={{alignItems: 'center'}}>
-              <Text style={[styles.includeFontPaddingText, {includeFontPadding: false, marginLeft: 10}]}>
-                Ey
-              </Text>
-              <Text>includeFontPadding: false</Text>
-            </View>
-          </View>
-          <Text>By default Android will put extra space above text to allow for upper-case accents or other ascenders. With some fonts, this can make text look slightly misaligned when centered vertically.</Text>
-        </UIExplorerBlock>
       </UIExplorerPage>
     );
   }
@@ -443,14 +421,6 @@ var styles = StyleSheet.create({
     left: 5,
     backgroundColor: 'rgba(100, 100, 100, 0.3)'
   },
-  includeFontPaddingText: {
-    fontSize: 120,
-    fontFamily: 'sans-serif',
-    backgroundColor: '#EEEEEE',
-    color: '#000000',
-    textAlignVertical: 'center',
-    alignSelf: 'center',
-  }
 });
 
 module.exports = TextExample;

Examples/UIExplorer/js/TextExample.ios.js

@@ -22,7 +22,6 @@
  */
 'use strict';
 
-const Platform = require('Platform');
 var React = require('react');
 var ReactNative = require('react-native');
 var {
@@ -191,10 +190,10 @@ exports.examples = [
   render: function() {
     return (
       <View>
-        <Text style={{fontFamily: (Platform.isTVOS ? 'Times' : 'Cochin')}}>
+        <Text style={{fontFamily: 'Cochin'}}>
           Cochin
         </Text>
-        <Text style={{fontFamily: (Platform.isTVOS ? 'Times' : 'Cochin'), fontWeight: 'bold'}}>
+        <Text style={{fontFamily: 'Cochin', fontWeight: 'bold'}}>
           Cochin bold
         </Text>
         <Text style={{fontFamily: 'Helvetica'}}>
@@ -203,10 +202,10 @@ exports.examples = [
         <Text style={{fontFamily: 'Helvetica', fontWeight: 'bold'}}>
           Helvetica bold
         </Text>
-        <Text style={{fontFamily: (Platform.isTVOS ? 'Courier' : 'Verdana')}}>
+        <Text style={{fontFamily: 'Verdana'}}>
           Verdana
         </Text>
-        <Text style={{fontFamily: (Platform.isTVOS ? 'Courier' : 'Verdana'), fontWeight: 'bold'}}>
+        <Text style={{fontFamily: 'Verdana', fontWeight: 'bold'}}>
           Verdana bold
         </Text>
       </View>
@@ -277,17 +276,6 @@ exports.examples = [
       </View>
     );
   },
-}, {
-  title: 'Selectable',
-  render: function() {
-    return (
-      <View>
-        <Text selectable={true}>
-          This text is <Text style={{fontWeight: 'bold'}}>selectable</Text> if you click-and-hold.
-        </Text>
-      </View>
-    );
-  },
 }, {
   title: 'Text Decoration',
   render: function() {
@@ -566,10 +554,10 @@ exports.examples = [
         <Text style={{fontVariant: ['small-caps']}}>
           Small Caps{'\n'}
         </Text>
-        <Text style={{fontFamily: (Platform.isTVOS ? 'Times' : 'Hoefler Text'), fontVariant: ['oldstyle-nums']}}>
+        <Text style={{fontFamily: 'Hoefler Text', fontVariant: ['oldstyle-nums']}}>
           Old Style nums 0123456789{'\n'}
         </Text>
-        <Text style={{fontFamily: (Platform.isTVOS ? 'Times' : 'Hoefler Text'), fontVariant: ['lining-nums']}}>
+        <Text style={{fontFamily: 'Hoefler Text', fontVariant: ['lining-nums']}}>
           Lining nums 0123456789{'\n'}
         </Text>
         <Text style={{fontVariant: ['tabular-nums']}}>

Examples/UIExplorer/js/ToolbarAndroidExample.android.js

@@ -24,8 +24,6 @@
 
 var React = require('react');
 var ReactNative = require('react-native');
-
-var nativeImageSource = require('nativeImageSource');
 var {
   StyleSheet,
   Text,
@@ -56,11 +54,7 @@ class ToolbarAndroidExample extends React.Component {
         <UIExplorerBlock title="Toolbar with title/subtitle and actions">
           <ToolbarAndroid
             actions={toolbarActions}
-            navIcon={nativeImageSource({
-              android: 'ic_menu_black_24dp',
-              width: 48,
-              height: 48
-            })}
+            navIcon={require('image!ic_menu_black_24dp')}
             onActionSelected={this._onActionSelected}
             onIconClicked={() => this.setState({actionText: 'Icon clicked'})}
             style={styles.toolbar}
@@ -70,11 +64,7 @@ class ToolbarAndroidExample extends React.Component {
         </UIExplorerBlock>
         <UIExplorerBlock title="Toolbar with logo & custom title view (a View with Switch+Text)">
           <ToolbarAndroid
-            logo={nativeImageSource({
-              android: 'launcher_icon',
-              width: 132,
-              height: 144
-            })}
+            logo={require('image!launcher_icon')}
             style={styles.toolbar}>
             <View style={{height: 56, flexDirection: 'row', alignItems: 'center'}}>
               <Switch
@@ -93,25 +83,13 @@ class ToolbarAndroidExample extends React.Component {
         <UIExplorerBlock title="Toolbar with navIcon & logo, no title">
           <ToolbarAndroid
             actions={toolbarActions}
-            logo={nativeImageSource({
-              android: 'launcher_icon',
-              width: 132,
-              height: 144
-            })}
-            navIcon={nativeImageSource({
-              android: 'ic_menu_black_24dp',
-              width: 48,
-              height: 48
-            })}
+            logo={require('image!launcher_icon')}
+            navIcon={require('image!ic_menu_black_24dp')}
             style={styles.toolbar} />
         </UIExplorerBlock>
         <UIExplorerBlock title="Toolbar with custom title colors">
           <ToolbarAndroid
-            navIcon={nativeImageSource({
-              android: 'ic_menu_black_24dp',
-              width: 48,
-              height: 48
-            })}
+            navIcon={require('image!ic_menu_black_24dp')}
             onIconClicked={() => this.setState({colorProps: {}})}
             title="Wow, such toolbar"
             style={styles.toolbar}
@@ -147,17 +125,9 @@ class ToolbarAndroidExample extends React.Component {
 }
 
 var toolbarActions = [
-  {title: 'Create', icon: nativeImageSource({
-    android: 'ic_create_black_48dp',
-    width: 96,
-    height: 96
-  }), show: 'always'},
+  {title: 'Create', icon: require('image!ic_create_black_48dp'), show: 'always'},
   {title: 'Filter'},
-  {title: 'Settings', icon: nativeImageSource({
-    android: 'ic_settings_black_48dp',
-    width: 96,
-    height: 96
-  }), show: 'always'},
+  {title: 'Settings', icon: require('image!ic_settings_black_48dp'), show: 'always'},
 ];
 
 var styles = StyleSheet.create({