[0.33.0] Bump version numbers

[React] Change React version to 15.3.1 (no more RC)
React 15.3.1 has been published; stop using the RC.
2025-11-01 09:14:26 +00:00 · 2016-09-09 14:58:29 +02:00 · 2016-09-06 22:42:30 -07:00 · 2016-09-06 12:36:04 -07:00 · 2016-09-06 10:58:56 -07:00 · 2016-09-06 10:58:42 -07:00
2429 changed files with 47867 additions and 139758 deletions
@@ -9,6 +9,3 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = 2
-
-[*.gradle]
-indent_size = 4
@@ -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
@@ -223,9 +221,6 @@
    "no-bitwise": 1,                 // disallow use of bitwise operators (off by default)
    "no-plusplus": 0,                // disallow use of unary operators, ++ and -- (off by default)

-  // React Plugin
-  // The following rules are made available via `eslint-plugin-react`.
-
    "react/display-name": 0,
    "react/jsx-boolean-value": 0,
    "react/jsx-no-duplicate-props": 2,
@@ -233,8 +228,8 @@
    "react/jsx-sort-props": 0,
    "react/jsx-uses-react": 1,
    "react/jsx-uses-vars": 1,
-    "react/no-did-mount-set-state": 1,
-    "react/no-did-update-set-state": 1,
+    "react/no-did-mount-set-state": [1, "allow-in-func"],
+    "react/no-did-update-set-state": [1, "allow-in-func"],
    "react/no-multi-comp": 0,
    "react/no-string-refs": 1,
    "react/no-unknown-property": 0,
@@ -1,25 +1,28 @@
 [ignore]
-; We fork some components by platform
-.*/*[.]android.js

-; Ignore templates for 'react-native init'
-.*/local-cli/templates/.*
+# We fork some components by platform.
+.*/*.android.js

-; Ignore the website subdir
+# Ignore templates with `@flow` in header
+.*/local-cli/generator.*
+
+# 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"
-.*/node_modules/.*/node_modules/fbjs/.*
-+.*/node_modules/react-dom/.*
+# Ignore unexpected extra @providesModule
+.*/node_modules/commoner/test/source/widget/share.js

-; 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]

@@ -28,26 +31,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\\.\\(4[0-0]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-0]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(30\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(30\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

 unsafe.enable_getters_and_setters=true

 [version]
-^0.40.0
+^0.30.0
@@ -1,25 +1,21 @@
-We use GitHub Issues for bugs.
+Hey there and thank you for using React Native!

-If you have a non-bug question, ask on Stack Overflow: http://stackoverflow.com/questions/tagged/react-native
+React Native, as you've probably heard, is getting really popular and truth is we're getting a bit overwhelmed by the activity surrounding it. There are just too many issues for us to manage properly.

-If you have a feature request, post it on Product Pains: https://productpains.com/product/react-native/
+Do the checklist before filing an issue:

--- Please use this template, and delete everything above this line before submitting your issue --- 
+- [ ] Is this something you can **debug and fix**? Send a pull request! Bug fixes and documentation fixes are welcome.
+- [ ] Have a usage question? Ask your question on [StackOverflow](http://stackoverflow.com/questions/tagged/react-native). We use StackOverflow for usage question and GitHub for bugs.
+- [ ] Have an idea for a feature? Post the feature request on [Product Pains](https://productpains.com/product/react-native/). It has a voting system to surface the important issues. GitHub issues should only be used for bugs.

-### Description

-[FILL THIS OUT: Explain what you did, what you expected to happen, and what actually happens.]
+None of the above, create a bug report
+------------------------------------------------------------------

-### Reproduction
+Make sure to add **all the information needed to understand the bug** so that someone can help. If the info is missing we'll add the 'Needs more information' label and close the issue until there is enough information.

-[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: Does the bug reproduce on the latest RN release?]
-* Platform: [FILL THIS OUT: iOS, Android, or both?]
-* Operating System: [FILL THIS OUT: MacOS, Linux, or Windows?]
+- [ ] Provide a **minimal code snippet** / [rnplay](https://rnplay.org/) example that reproduces the bug.
+- [ ] Provide **screenshots** where appropriate
+- [ ] What's the **version** of React Native you're using?
+- [ ] Does this occur on iOS, Android or both?
+- [ ] Are you using Mac, Linux or Windows?
@@ -34,7 +34,6 @@ project.xcworkspace
 buck-out
 /ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/
 /ReactAndroid/src/main/jni/prebuilt/lib/x86/
-/ReactAndroid/src/main/gen

 # Android
 .idea
@@ -53,4 +52,3 @@ node_modules

 # Test generated files
 /ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
-*.js.meta
@@ -1,3 +1,2 @@
 # rnpm
 /local-cli/rnpm
-/local-cli/server/middleware/heapCapture/bundle.js
@@ -1,6 +1,6 @@
 language: objective-c

-osx_image: xcode8
+osx_image: xcode7.3

 install:
  - mkdir -p /Users/travis/build/facebook/.nvm
@@ -8,28 +8,23 @@ install:
  - brew install nvm
  - source $(brew --prefix nvm)/nvm.sh
  # TODO npm 2 started stalling on Travis, t11852928
-
-  # Use node 6 because that is what runs on land-blocking tests
-  - nvm install 6
+  - nvm install 5
  - rm -Rf "${TMPDIR}/jest_preprocess_cache"
-  - wget https://github.com/yarnpkg/yarn/releases/download/v0.16.0/yarn-0.16.0.js
-  - export yarn="node $(pwd)/yarn-0.16.0.js"
-  - $yarn install
+  - npm config set spin=false
+  - npm config set progress=false
+  - travis_wait npm install

 script:
-  - if [[ "$TEST_TYPE" = objc-ios ]]; then travis_retry travis_wait ./scripts/objc-test-ios.sh; fi
+  - if [[ "$TEST_TYPE" = objc ]]; then travis_retry travis_wait ./scripts/objc-test.sh; fi
  - if [[ "$TEST_TYPE" = e2e-objc ]]; then node ./scripts/run-ci-e2e-tests.js --ios --js --retries 3; fi
-  - if [[ ( "$TEST_TYPE" = podspecs ) && ( "$TRAVIS_PULL_REQUEST" = "false" ) ]]; then gem install cocoapods && ./scripts/process-podspecs.sh; fi
+  - if [[ "$TEST_TYPE" = js ]]; then npm run flow check; fi
+  - if [[ "$TEST_TYPE" = js ]]; then npm test -- --maxWorkers=1; fi

-
-matrix:
-  - fast_finish: true # Fail the whole build as soon as one test type fails. Should help with Travis capacity issues (very long queues).
-
-# The order of these tests says which are more likely to run first and fail the whole build fast.
 env:
-  - TEST_TYPE=objc-ios
-  - TEST_TYPE=podspecs
-  - TEST_TYPE=e2e-objc
+  matrix:
+    - TEST_TYPE=e2e-objc
+    - TEST_TYPE=objc
+    - TEST_TYPE=js

 branches:
  only:
@@ -39,12 +34,6 @@ branches:
 notifications:
  email:
    recipients:
-      - mkonicek@fb.com
-      - eloy@artsy.net # Eloy Durán maintains the podspecs test and wants to be notified about failures.
-    on_failure: change
-    on_success: change
-  slack:
-    secure: oQL2C966v7/DtxNqfM7WowjY0R5mgLHR2qHkoucwK5iVrmaptnHr8fq01xlj7VT0kDwNLqT3n4+gtCviGw89lq71m3W76c8Pms/10jpjw+LwAfQPVizNw/Bx8MFNNmjDauK/auFxaybiLZupi7zd4xFGOZvScmFdfD4CAAp2OOA=
-    on_pull_requests: false
+      - bestander@gmail.com
    on_failure: change
    on_success: change
@@ -1,55 +0,0 @@
-FROM containership/android-base:latest
-
-# set default environment variables
-ENV GRADLE_OPTS="-Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
-ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
-ENV REACT_NATIVE_MAX_WORKERS=1
-
-# add ReactAndroid directory
-ADD .buckconfig /app/.buckconfig
-ADD .buckjavaargs /app/.buckjavaargs
-ADD ReactAndroid /app/ReactAndroid
-ADD ReactCommon /app/ReactCommon
-ADD keystores /app/keystores
-
-# set workdir
-WORKDIR /app
-
-# run buck fetches
-RUN buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
-RUN buck fetch ReactAndroid/src/main/java/com/facebook/react
-RUN buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
-RUN buck fetch ReactAndroid/src/test/...
-RUN buck fetch ReactAndroid/src/androidTest/...
-
-# build app
-RUN buck build ReactAndroid/src/main/java/com/facebook/react
-RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
-
-ADD gradle /app/gradle
-ADD gradlew /app/gradlew
-ADD settings.gradle /app/settings.gradle
-ADD build.gradle /app/build.gradle
-ADD react.gradle /app/react.gradle
-
-# run gradle downloads
-RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
-
-# compile native libs with Gradle script, we need bridge for unit and integration tests
-RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1 -Pcom.android.build.threadPoolSize=1
-
-# add all react-native code
-ADD . /app
-WORKDIR /app
-
-# https://github.com/npm/npm/issues/13306
-RUN cd $(npm root -g)/npm && npm install fs-extra && sed -i -e s/graceful-fs/fs-extra/ -e s/fs.rename/fs.move/ ./lib/utils/rename.js
-
-# build node dependencies
-RUN npm install
-RUN npm install github@0.2.4
-
-WORKDIR /app/website
-RUN npm install
-
-WORKDIR /app
@@ -1,78 +0,0 @@
-FROM library/ubuntu:16.04
-
-# set default build arguments
-ARG ANDROID_VERSION=25.2.3
-ARG BUCK_VERSION=2016.11.11.01
-ARG NDK_VERSION=10e
-ARG NODE_VERSION=6.2.0
-ARG WATCHMAN_VERSION=4.7.0
-
-# set default environment variables
-ENV ADB_INSTALL_TIMEOUT=10
-ENV PATH=${PATH}:/opt/buck/bin/
-ENV ANDROID_HOME=/opt/android
-ENV ANDROID_SDK_HOME=${ANDROID_HOME}
-ENV PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-ENV ANDROID_NDK=/opt/ndk/android-ndk-r$NDK_VERSION
-ENV PATH=${PATH}:${ANDROID_NDK}
-
-# install system dependencies
-RUN apt-get update && apt-get install ant autoconf automake curl g++ gcc git libqt5widgets5 lib32z1 lib32stdc++6 make maven npm openjdk-8* python-dev python3-dev qml-module-qtquick-controls qtdeclarative5-dev unzip -y
-
-# configure npm
-RUN npm config set spin=false
-RUN npm config set progress=false
-
-# install node
-RUN npm install n -g
-RUN n $NODE_VERSION
-
-# download buck
-RUN git clone https://github.com/facebook/buck.git /opt/buck
-WORKDIR /opt/buck
-RUN git checkout v$BUCK_VERSION
-
-# build buck
-RUN ant
-
-# download watchman
-RUN git clone https://github.com/facebook/watchman.git /opt/watchman
-WORKDIR /opt/watchman
-RUN git checkout v$WATCHMAN_VERSION
-
-# build watchman
-RUN ./autogen.sh
-RUN ./configure
-RUN make
-RUN make install
-
-# download and unpack android
-RUN mkdir /opt/android
-WORKDIR /opt/android
-RUN curl --silent https://dl.google.com/android/repository/tools_r$ANDROID_VERSION-linux.zip > android.zip
-RUN unzip android.zip
-RUN rm android.zip
-
-# download and unpack NDK
-RUN mkdir /opt/ndk
-WORKDIR /opt/ndk
-RUN curl --silent https://dl.google.com/android/repository/android-ndk-r$NDK_VERSION-linux-x86_64.zip > ndk.zip
-RUN unzip ndk.zip
-
-# cleanup NDK
-RUN rm ndk.zip
-
-# add android SDK tools
-# 2 - Android SDK Platform-tools, revision 25.0.3
-# 12 - Android SDK Build-tools, revision 23.0.1
-# 35 - SDK Platform Android 6.0, API 23, revision 3
-# 39 - SDK Platform Android 4.4.2, API 19, revision 4
-# 102 - ARM EABI v7a System Image, Android API 19, revision 5
-# 103 - Intel x86 Atom System Image, Android API 19, revision 5
-# 131 - Google APIs, Android API 23, revision 1
-# 166 - Android Support Repository, revision 41
-RUN echo "y" | android update sdk -u -a -t 2,12,35,39,102,103,131,166
-RUN ln -s /opt/android/platform-tools/adb /usr/bin/adb
-
-# clean up unnecessary directories
-RUN rm -rf /opt/android/system-images/android-19/default/x86
@@ -1,19 +0,0 @@
-FROM library/node:6.9.2
-
-ENV YARN_VERSION=0.19.1
-
-# install dependencies
-RUN apt-get update && apt-get install ocaml libelf-dev -y
-RUN npm install yarn@$YARN_VERSION -g
-
-# add code
-RUN mkdir /app
-ADD . /app
-
-WORKDIR /app
-RUN yarn install --ignore-engines
-
-WORKDIR website
-RUN yarn install --ignore-engines --ignore-platform
-
-WORKDIR /app
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2015-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.
- */
-
-'use strict';
-
-/**
- * This script runs instrumentation tests one by one with retries
- * Instrumentation tests tend to be flaky, so rerunning them individually increases
- * chances for success and reduces total average execution time.
- *
- * We assume that all instrumentation tests are flat in one folder
- * Available arguments:
- * --path - path to all .java files with tests
- * --package - com.facebook.react.tests
- * --retries [num] - how many times to retry possible flaky commands: npm install and running tests, default 1
- */
-/*eslint-disable no-undef */
-
-const argv = require('yargs').argv;
-const async = require('async');
-const child_process = require('child_process');
-const fs = require('fs');
-const path = require('path');
-
-const colors = {
-    GREEN: '\x1b[32m',
-    RED: '\x1b[31m',
-    RESET: '\x1b[0m'
-};
-
-const test_opts = {
-    FILTER: new RegExp(argv.filter || '.*', 'i'),
-    PACKAGE: argv.package || 'com.facebook.react.tests',
-    PATH: argv.path || './ReactAndroid/src/androidTest/java/com/facebook/react/tests',
-    RETRIES: parseInt(argv.retries || 2, 10),
-
-    TEST_TIMEOUT: parseInt(argv['test-timeout'] || 1000 * 60 * 10),
-
-    OFFSET: argv.offset,
-    COUNT: argv.count
-}
-
-let max_test_class_length = Number.NEGATIVE_INFINITY;
-
-let testClasses = fs.readdirSync(path.resolve(process.cwd(), test_opts.PATH))
-    .filter((file) => {
-        return file.endsWith('.java');
-    }).map((clazz) => {
-        return path.basename(clazz, '.java');
-    }).map((clazz) => {
-        return test_opts.PACKAGE + '.' + clazz;
-    }).filter((clazz) => {
-        return test_opts.FILTER.test(clazz);
-    });
-
-// only process subset of the tests at corresponding offset and count if args provided
-if (test_opts.COUNT != null && test_opts.OFFSET != null) {
-    const testCount = testClasses.length;
-    const start = test_opts.COUNT * test_opts.OFFSET;
-    const end = start + test_opts.COUNT;
-
-    if (start >= testClasses.length) {
-        testClasses = [];
-    } else if (end >= testClasses.length) {
-        testClasses = testClasses.slice(start);
-    } else {
-        testClasses = testClasses.slice(start, end);
-    }
-}
-
-return async.mapSeries(testClasses, (clazz, callback) => {
-    if(clazz.length > max_test_class_length) {
-        max_test_class_length = clazz.length;
-    }
-
-    return async.retry(test_opts.RETRIES, (retryCb) => {
-        const test_process = child_process.spawn('./ContainerShip/scripts/run-instrumentation-tests-via-adb-shell.sh', [test_opts.PACKAGE, clazz], {
-            stdio: 'inherit'
-        })
-
-        const timeout = setTimeout(() => {
-            test_process.kill();
-        }, test_opts.TEST_TIMEOUT);
-
-        test_process.on('error', (err) => {
-            clearTimeout(timeout);
-            retryCb(err);
-        });
-
-        test_process.on('exit', (code) => {
-            clearTimeout(timeout);
-
-            if(code !== 0) {
-                return retryCb(new Error(`Process exited with code: ${code}`));
-            }
-
-            return retryCb();
-        });
-    }, (err) => {
-        return callback(null, {
-            name: clazz,
-            status: err ? 'failure' : 'success'
-        });
-    });
-}, (err, results) => {
-    print_test_suite_results(results);
-
-    const failures = results.filter((test) => {
-        test.status === 'failure';
-    });
-
-    return failures.length === 0 ? process.exit(0) : process.exit(1);
-});
-
-function print_test_suite_results(results) {
-    console.log('\n\nTest Suite Results:\n');
-
-    let color;
-    let failing_suites = 0;
-    let passing_suites = 0;
-
-    function pad_output(num_chars) {
-        let i = 0;
-
-        while(i < num_chars) {
-            process.stdout.write(' ');
-            i++;
-        }
-    }
-    results.forEach((test) => {
-        if(test.status === 'success') {
-            color = colors.GREEN;
-            passing_suites++;
-        } else if(test.status === 'failure') {
-            color = colors.RED;
-            failing_suites++;
-        }
-
-        process.stdout.write(color);
-        process.stdout.write(test.name);
-        pad_output((max_test_class_length - test.name.length) + 8);
-        process.stdout.write(test.status);
-        process.stdout.write(`${colors.RESET}\n`);
-    });
-
-    console.log(`\n${passing_suites} passing, ${failing_suites} failing!`);
-}
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# for buck gen
-mount -o remount,exec /dev/shm
-
-AVD_UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
-
-# create virtual device
-echo no | android create avd -n $AVD_UUID -f -t android-19 --abi default/armeabi-v7a
-
-# emulator setup
-emulator64-arm -avd $AVD_UUID -no-skin -no-audio -no-window -no-boot-anim &
-bootanim=""
-until [[ "$bootanim" =~ "stopped" ]]; do
-    sleep 5
-    bootanim=$(adb -e shell getprop init.svc.bootanim 2>&1)
-    echo "boot animation status=$bootanim"
-done
-
-set -x
-
-# solve issue with max user watches limit
-echo 65536 | tee -a /proc/sys/fs/inotify/max_user_watches
-watchman shutdown-server
-
-# integration tests
-# build JS bundle for instrumentation tests
-node local-cli/cli.js bundle --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
-
-# build test APK
-buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
-
-# run installed apk with tests
-node ./ContainerShip/scripts/run-android-ci-instrumentation-tests.js $*
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# set default environment variables
-UNIT_TESTS_BUILD_THREADS="${UNIT_TESTS_BUILD_THREADS:-1}"
-
-# for buck gen
-mount -o remount,exec /dev/shm
-
-set -x
-
-# run unit tests
-buck test ReactAndroid/src/test/... --config build.threads=$UNIT_TESTS_BUILD_THREADS
@@ -1,250 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# set default environment variables
-ROOT=$(pwd)
-SCRIPTS=$(pwd)/scripts
-
-RUN_ANDROID=0
-RUN_CLI_INSTALL=1
-RUN_IOS=0
-RUN_JS=0
-
-RETRY_COUNT=${RETRY_COUNT:-3}
-AVD_UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
-
-ANDROID_NPM_DEPS="appium@1.5.1 mocha@2.4.5 wd@0.3.11 colors@1.0.3 pretty-data2@0.40.1"
-CLI_PACKAGE=$ROOT/react-native-cli/react-native-cli-*.tgz
-PACKAGE=$ROOT/react-native-*.tgz
-REACT_NATIVE_MAX_WORKERS=1
-
-# retries command on failure
-# $1 -- max attempts
-# $2 -- command to run
-function retry() {
-    local -r -i max_attempts="$1"; shift
-    local -r cmd="$@"
-    local -i attempt_num=1
-
-    until $cmd; do
-        if (( attempt_num == max_attempts )); then
-            echo "Execution of '$cmd' failed; no more attempts left"
-            return 1
-        else
-            (( attempt_num++ ))
-            echo "Execution of '$cmd' failed; retrying for attempt number $attempt_num..."
-        fi
-    done
-}
-
-# parse command line args & flags
-while :; do
-  case "$1" in
-    --android)
-      RUN_ANDROID=1
-      shift
-      ;;
-
-    --ios)
-      RUN_IOS=1
-      shift
-      ;;
-
-    --js)
-      RUN_JS=1
-      shift
-      ;;
-
-    --skip-cli-install)
-      RUN_CLI_INSTALL=0
-      shift
-      ;;
-
-    --tvos)
-      RUN_IOS=1
-      shift
-      ;;
-
-    *)
-      break
-  esac
-done
-
-function e2e_suite() {
-    cd $ROOT
-
-    if [ $RUN_ANDROID -eq 0 ] && [ $RUN_IOS -eq 0 ] && [ $RUN_JS -eq 0 ]; then
-      echo "No e2e tests specified!"
-      return 0
-    fi
-
-    # create temp dir
-    TEMP_DIR=$(mktemp -d /tmp/react-native-XXXXXXXX)
-
-    # To make sure we actually installed the local version
-    # of react-native, we will create a temp file inside the template
-    # and check that it exists after `react-native init
-    IOS_MARKER=$(mktemp $ROOT/local-cli/templates/HelloWorld/ios/HelloWorld/XXXXXXXX)
-    ANDROID_MARKER=$(mktemp ${ROOT}/local-cli/templates/HelloWorld/android/XXXXXXXX)
-
-    # install CLI
-    cd react-native-cli
-    npm pack
-    cd ..
-
-    # can skip cli install for non sudo mode
-    if [ $RUN_CLI_INSTALL -ne 0 ]; then
-      npm install -g $CLI_PACKAGE
-      if [ $? -ne 0 ]; then
-        echo "Could not install react-native-cli globally, please run in su mode"
-        echo "Or with --skip-cli-install to skip this step"
-        return 1
-      fi
-    fi
-
-    if [ $RUN_ANDROID -ne 0 ]; then
-        set +ex
-
-        # create virtual device
-        if ! android list avd | grep "$AVD_UUID" > /dev/null; then
-            echo no | android create avd -n $AVD_UUID -f -t android-19 --abi default/armeabi-v7a
-        fi
-
-        # newline at end of adb devices call and first line is headers
-        DEVICE_COUNT=$(adb devices | wc -l)
-        ((DEVICE_COUNT -= 2))
-
-        # will always kill an existing emulator if one exists for fresh setup
-        if [[ $DEVICE_COUNT -ge 1 ]]; then
-            adb emu kill
-        fi
-
-        # emulator setup
-        emulator64-arm -avd $AVD_UUID -no-skin -no-audio -no-window -no-boot-anim &
-
-        bootanim=""
-        until [[ "$bootanim" =~ "stopped" ]]; do
-            sleep 5
-            bootanim=$(adb -e shell getprop init.svc.bootanim 2>&1)
-            echo "boot animation status=$bootanim"
-        done
-
-        set -ex
-
-      ./gradlew :ReactAndroid:installArchives -Pjobs=1 -Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError"
-      if [ $? -ne 0 ]; then
-        echo "Failed to compile Android binaries"
-        return 1
-      fi
-    fi
-
-    npm pack
-    if [ $? -ne 0 ]; then
-      echo "Failed to pack react-native"
-      return 1
-    fi
-
-    cd $TEMP_DIR
-
-    retry $RETRY_COUNT react-native init EndToEndTest --version $PACKAGE --npm
-    if [ $? -ne 0 ]; then
-      echo "Failed to execute react-native init"
-      echo "Most common reason is npm registry connectivity, try again"
-      return 1
-    fi
-
-    cd EndToEndTest
-
-    # android tests
-    if [ $RUN_ANDROID -ne 0 ]; then
-      echo "Running an Android e2e test"
-      echo "Installing e2e framework"
-
-      retry $RETRY_COUNT npm install --save-dev $ANDROID_NPM_DEPS --silent >> /dev/null
-      if [ $? -ne 0 ]; then
-        echo "Failed to install appium"
-        echo "Most common reason is npm registry connectivity, try again"
-        return 1
-      fi
-
-      cp $SCRIPTS/android-e2e-test.js android-e2e-test.js
-
-      cd android
-      echo "Downloading Maven deps"
-      ./gradlew :app:copyDownloadableDepsToLibs
-
-      cd ..
-      keytool -genkey -v -keystore android/keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"
-
-      echo "Starting packager server"
-      node ./node_modules/.bin/appium >> /dev/null &
-      APPIUM_PID=$!
-      echo "Starting appium server $APPIUM_PID"
-
-      echo "Building app"
-      buck build android/app
-
-      # hack to get node unhung (kill buckd)
-      kill -9 $(pgrep java)
-
-      if [ $? -ne 0 ]; then
-        echo "could not execute Buck build, is it installed and in PATH?"
-        return 1
-      fi
-
-      npm start >> /dev/null &
-      SERVER_PID=$!
-      sleep 15
-
-      echo "Executing android e2e test"
-      retry $RETRY_COUNT node node_modules/.bin/_mocha android-e2e-test.js
-      if [ $? -ne 0 ]; then
-        echo "Failed to run Android e2e tests"
-        echo "Most likely the code is broken"
-        return 1
-      fi
-
-      # kill packager process
-      if kill -0 $SERVER_PID; then
-        echo "Killing packager $SERVER_PID"
-        kill -9 $SERVER_PID
-      fi
-
-      # kill appium process
-      if kill -0 $APPIUM_PID; then
-        echo "Killing appium $APPIUM_PID"
-        kill -9 $APPIUM_PID
-      fi
-
-    fi
-
-    # ios tests
-    if [ $RUN_IOS -ne 0 ]; then
-      echo "Running ios e2e tests not yet implemented for docker!"
-    fi
-
-    # js tests
-    if [ $RUN_JS -ne 0 ]; then
-      # Check the packager produces a bundle (doesn't throw an error)
-      REACT_NATIVE_MAX_WORKERS=1 react-native bundle --platform android --dev true --entry-file index.android.js --bundle-output android-bundle.js
-      if [ $? -ne 0 ]; then
-        echo "Could not build android bundle"
-        return 1
-      fi
-
-      REACT_NATIVE_MAX_WORKERS=1 react-native bundle --platform ios --dev true --entry-file index.ios.js --bundle-output ios-bundle.js
-      if [ $? -ne 0 ]; then
-        echo "Could not build iOS bundle"
-        return 1
-      fi
-    fi
-
-    # directory cleanup
-    rm $IOS_MARKER
-    rm $ANDROID_MARKER
-
-    return 0
-}
-
-retry $RETRY_COUNT e2e_suite
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# Python script to run instrumentation tests, copied from https://github.com/circleci/circle-dummy-android
-# Example: ./scripts/run-android-instrumentation-tests.sh com.facebook.react.tests com.facebook.react.tests.ReactPickerTestCase
-#
-export PATH="$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$PATH"
-
-# clear the logs
-adb logcat -c
-
-# run tests and check output
-python - $1 $2 << END
-
-import re
-import subprocess as sp
-import sys
-import threading
-import time
-
-done = False
-
-test_app = sys.argv[1]
-test_class = None
-
-if len(sys.argv) > 2:
-  test_class = sys.argv[2]
-  
-def update():
-  # prevent CircleCI from killing the process for inactivity
-  while not done:
-    time.sleep(5)
-    print "Running in background.  Waiting for 'adb' command reponse..."
-
-t = threading.Thread(target=update)
-t.dameon = True
-t.start()
-
-def run():
-  sp.Popen(['adb', 'wait-for-device']).communicate()
-  if (test_class != None):
-    p = sp.Popen('adb shell am instrument -w -e class %s %s/android.support.test.runner.AndroidJUnitRunner' 
-      % (test_class, test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
-  else :
-    p = sp.Popen('adb shell am instrument -w %s/android.support.test.runner.AndroidJUnitRunner' 
-      % (test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
-  return p.communicate()
-
-success = re.compile(r'OK \(\d+ test(s)?\)')
-stdout, stderr = run()
-
-done = True
-print stderr
-print stdout
-
-if success.search(stderr + stdout):
-  sys.exit(0)
-else:
-  # dump the logs
-  sp.Popen(['adb', 'logcat', '-d']).communicate()
-  sys.exit(1) # make sure we fail if the test failed
-END
-
-RETVAL=$?
-
-exit $RETVAL
@@ -1,96 +0,0 @@
-# Dockerfile Tests
-
-This is a high level overview of the test configuration using docker. It explains how to run the tests locally
-and how they integrate with the Jenkins Pipeline script to run the automated tests on ContainerShip <https://www.containership.io/>.
-
-## Docker Installation
-
-It is required to have Docker running on your machine in order to build and run the tests in the Dockerfiles.
-See <https://docs.docker.com/engine/installation/> for more information on how to install.
-
-## Convenience NPM Run Scripts
-
-We have added a number of default run scripts to the `package.json` file to simplify building and running your tests.
-
-`npm run test-android-setup` - Pulls down the base android docker image used for running the tests
-
-`npm run test-android-build` - Builds the docker image used to run the tests
-
-`npm run test-android-run-unit` - Runs all the unit tests that have been built in the latest react/android docker image (note: you need to run test-android-build before executing this, if the image does not exist it will fail)
-
-`npm run test-android-run-instrumentation` - Runs all the instrumentation tests that have been built in the latest react/android docker image (note: you need to run test-android-build before executing this, if the image does not exist it will fail). You can also pass additional flags to filter which tests instrumentation tests are run. Ex: `npm run test-android-run-instrumentation -- --filter=TestIdTestCase` to only run the TestIdTestCase instrumentation test. See below for more information
-on the instrumentation test flags.
-
-`npm run test-android-run-e2e` - Runs all the end to end tests that have been built in the latest react/android docker image (note: you need to run test-android-build before executing this, if the image does not exist it will fail)
-
-`npm run test-android-unit` - Builds and runs the android unit tests.
-
-`npm run test-android-instrumentation` - Builds and runs the android instrumentation tests.
-
-`npm run test-android-e2e` - Builds and runs the android end to end tests.
-
-## Detailed Android Setup
-
-There are two Dockerfiles for use with the Android codebase.
-
-The `Dockerfile.android-base` contains all the necessary prerequisites required to run the React Android tests. It is
-separated out into a separate Dockerfile because these are dependencies that rarely change and also because it is quite
-a beastly image since it contains all the Android depedencies for running android and the emulators (~9GB).
-
-The good news is you should rarely have to build or pull down the base image! All iterative code updates happen as
-part of the `Dockerfile.android` image build.
-
-So step one...
-
-`docker pull containership/android-base:latest`
-
-This will take quite some time depending on your connection and you need to ensure you have ~10GB of free disk space.
-
-Once this is done, you can run tests locally by executing two simple commands:
-
-1. `docker build -t react/android -f ./ContainerShip/Dockerfile.android .`
-2. `docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-unit-tests.sh`
-
-> Note: `--cap-add=SYS_ADMIN` flag is required for the `ContainerShip/scripts/run-android-docker-unit-tests.sh` and
-`ContainerShip/scripts/run-android-docker-instrumentation-tests.sh` in order to allow the remounting of `/dev/shm` as writeable
-so the `buck` build system may write temporary output to that location
-
-Every time you make any modifications to the codebase, you should re-run the `docker build ...` command in order for your
-updates to be included in your local docker image.
-
-The following shell scripts have been provided for android testing:
-
-`ContainerShip/scripts/run-android-docker-unit-tests.sh` - Runs the standard android unit tests
-
-`ContainerShip/scripts/run-android-docker-instrumentation-tests.sh` - Runs the android instrumentation tests on the emulator. *Note* that these
-tests take quite some time to run so there are various flags you can pass in order to filter which tests are run (see below)
-
-`ContainerShip/scripts/run-ci-e2e-tests.sh` - Runs the android end to end tests
-
-#### ContainerShip/scripts/run-android-docker-instrumentation-tests.sh
-
-The instrumentation test script accepts the following flags in order to customize the execution of the tests:
-
-`--filter` - A regex that filters which instrumentation tests will be run. (Defaults to .*)
-
-`--package` - Name of the java package containing the instrumentation tests (Defaults to com.facebook.react.tests)
-
-`--path` - Path to the directory containing the instrumentation tests. (Defaults to ./ReactAndroid/src/androidTest/java/com/facebook/react/tests)
-
-`--retries` - Number of times to retry a failed test before declaring a failure (Defaults to 2)
-
-For example, if locally you only wanted to run the InitialPropsTestCase, you could do the following:
-
-`docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-instrumentation-tests.sh --filter="InitialPropsTestCase"`
-
-# Javascript Setup
-
-There is a single Dockerfile for use with the javascript codebase.
-
-The `Dockerfile.javascript` base requires all the necessary dependencies for running Javascript tests.
-
-Any time you make an update to the codebase, you can build and run the javascript tests with the following three commands:
-
-1. `docker build -t react/js -f ./ContainerShip/Dockerfile.javascript .`
-2. `docker run -it react/js yarn test --maxWorkers=4`
-3. `docker run -it react/js yarn run flow -- check`
@@ -415,7 +415,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -455,7 +455,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -12,7 +12,6 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 * @flow
- * @providesModule MovieCell
 */
 'use strict';

@@ -12,7 +12,6 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 * @flow
- * @providesModule MovieScreen
 */
 'use strict';

@@ -446,7 +446,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -486,7 +486,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -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">
@@ -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"
@@ -17,7 +17,7 @@ Mac OS and Xcode are required.
 - Open `Examples/Movies/Movies.xcodeproj` in Xcode
 - Hit the Run button

-See [Running on device](https://facebook.github.io/react-native/docs/running-on-device.html) if you want to use a physical device.
+See [Running on device](https://facebook.github.io/react-native/docs/running-on-device-ios.html) if you want to use a physical device.

 ### Running on Android

@@ -33,7 +33,7 @@ _Note: Building for the first time can take a while._

 Open the Movies app in your emulator.

-See [Running on Device](https://facebook.github.io/react-native/docs/running-on-device.html) in case you want to use a physical device.
+See [Running on Device](https://facebook.github.io/react-native/docs/running-on-device-android.html) in case you want to use a physical device.

 ### Running with Buck

@@ -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>
@@ -12,7 +12,6 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 * @flow
- * @providesModule SearchScreen
 */
 'use strict';

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

@@ -1,31 +1,31 @@
-include_defs("//ReactAndroid/DEFS")
+include_defs('//ReactAndroid/DEFS')

 android_binary(
-    name = "app",
-    keystore = "//keystores:debug",
-    manifest = "src/main/AndroidManifest.xml",
-    deps = [
-        ":movies-lib",
-    ],
+  name = 'app',
+  manifest = 'src/main/AndroidManifest.xml',
+  keystore = '//keystores:debug',
+  deps = [
+    ':movies-lib',
+  ],
 )

 android_library(
-    name = "movies-lib",
-    srcs = glob(["src/main/java/**/*.java"]),
-    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("jni/prebuilt:android-jsc"),
-        # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
-        react_native_target("jni/prebuilt:reactnative-libs"),
-    ],
+  name = 'movies-lib',
+  srcs = glob(['src/main/java/**/*.java']),
+  deps = [
+    ':res',
+    react_native_dep('third-party/java/jsr-305:jsr-305'),
+    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'),
+  ],
 )

 android_resource(
-    name = "res",
-    package = "com.facebook.react.movies",
-    res = "src/main/res",
+  name = 'res',
+  res = 'src/main/res',
+  package = 'com.facebook.react.movies',
 )
@@ -39,7 +39,7 @@ public class MoviesApplication extends Application implements ReactApplication {
    }

    @Override
-    public boolean getUseDeveloperSupport() {
+    protected boolean getUseDeveloperSupport() {
      return true;
    }

@@ -12,7 +12,6 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 * @flow
- * @providesModule getImageSource
 */
 'use strict';

@@ -12,7 +12,6 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 * @flow
- * @providesModule getStyleFromScore
 */
 'use strict';

@@ -12,7 +12,6 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 * @flow
- * @providesModule getTextFromScore
 */
 'use strict';

@@ -444,7 +444,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -484,7 +484,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -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">
@@ -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',
  },
@@ -1,31 +1,31 @@
-include_defs("//ReactAndroid/DEFS")
+include_defs('//ReactAndroid/DEFS')

 android_binary(
-    name = "app",
-    keystore = "//keystores:debug",
-    manifest = "src/main/AndroidManifest.xml",
-    deps = [
-        ":tictactoe-lib",
-    ],
+  name = 'app',
+  manifest = 'src/main/AndroidManifest.xml',
+  keystore = '//keystores:debug',
+  deps = [
+    ':tictactoe-lib',
+  ],
 )

 android_library(
-    name = "tictactoe-lib",
-    srcs = glob(["src/main/java/**/*.java"]),
-    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("jni/prebuilt:android-jsc"),
-        # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
-        react_native_target("jni/prebuilt:reactnative-libs"),
-    ],
+  name = 'tictactoe-lib',
+  srcs = glob(['src/main/java/**/*.java']),
+  deps = [
+    ':res',
+    react_native_dep('third-party/java/jsr-305:jsr-305'),
+    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'),
+  ],
 )

 android_resource(
-    name = "res",
-    package = "com.facebook.react.tictactoe",
-    res = "src/main/res",
+  name = 'res',
+  res = 'src/main/res',
+  package = 'com.facebook.react.tictactoe',
 )
@@ -39,7 +39,7 @@ public class TicTacToeApplication extends Application implements ReactApplicatio
    }

    @Override
-    public boolean getUseDeveloperSupport() {
+    protected boolean getUseDeveloperSupport() {
      return true;
    }

@@ -17,7 +17,7 @@ Mac OS and Xcode are required.
 - Open `Examples/UIExplorer/UIExplorer.xcodeproj` in Xcode
 - Hit the Run button

-See [Running on device](https://facebook.github.io/react-native/docs/running-on-device.html) if you want to use a physical device.
+See [Running on device](https://facebook.github.io/react-native/docs/running-on-device-ios.html) if you want to use a physical device.

 ### Running on Android

@@ -33,7 +33,7 @@ _Note: Building for the first time can take a while._

 Open the UIExplorer app in your emulator.

-See [Running on Device](https://facebook.github.io/react-native/docs/running-on-device.html) in case you want to use a physical device.
+See [Running on Device](https://facebook.github.io/react-native/docs/running-on-device-android.html) in case you want to use a physical device.

 ### Running with Buck

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>arm64</string>
-	</array>
-	<key>UIUserInterfaceStyle</key>
-	<string>Automatic</string>
-</dict>
-</plist>
@@ -1,132 +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 = "2D2A28121D9B038B00D4039D"
-               BuildableName = "libReact.a"
-               BlueprintName = "React-tvOS"
-               ReferencedContainer = "container:../../React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2DD3238F1DA2DD8A000FE1B8"
-               BuildableName = "UIExplorer-tvOS.app"
-               BlueprintName = "UIExplorer-tvOS"
-               ReferencedContainer = "container:UIExplorer.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 = "2DD323A41DA2DD8B000FE1B8"
-               BuildableName = "UIExplorer-tvOSUnitTests.xctest"
-               BlueprintName = "UIExplorer-tvOSUnitTests"
-               ReferencedContainer = "container:UIExplorer.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2D4624C11DA2EA6900C74D09"
-               BuildableName = "UIExplorer-tvOSIntegrationTests.xctest"
-               BlueprintName = "UIExplorer-tvOSIntegrationTests"
-               ReferencedContainer = "container:UIExplorer.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2DD3238F1DA2DD8A000FE1B8"
-            BuildableName = "UIExplorer-tvOS.app"
-            BlueprintName = "UIExplorer-tvOS"
-            ReferencedContainer = "container:UIExplorer.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 = "2DD3238F1DA2DD8A000FE1B8"
-            BuildableName = "UIExplorer-tvOS.app"
-            BlueprintName = "UIExplorer-tvOS"
-            ReferencedContainer = "container:UIExplorer.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "CI_USE_PACKAGER"
-            value = "1"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2DD3238F1DA2DD8A000FE1B8"
-            BuildableName = "UIExplorer-tvOS.app"
-            BlueprintName = "UIExplorer-tvOS"
-            ReferencedContainer = "container:UIExplorer.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -1,39 +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"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3D13F83D1D6F6AE000E69E0E"
-               BuildableName = "UIExplorerBundle.bundle"
-               BlueprintName = "UIExplorerBundle"
-               ReferencedContainer = "container:UIExplorer.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
         <BuildActionEntry
            buildForTesting = "YES"
            buildForRunning = "YES"
@@ -14,15 +14,11 @@

 #import "AppDelegate.h"

-#import <React/RCTBridge.h>
-#import <React/RCTBundleURLProvider.h>
-#import <React/RCTJavaScriptLoader.h>
-#import <React/RCTLinkingManager.h>
-#import <React/RCTRootView.h>
-
-#if !TARGET_OS_TV
-#import <React/RCTPushNotificationManager.h>
-#endif
+#import "RCTBridge.h"
+#import "RCTBundleURLProvider.h"
+#import "RCTJavaScriptLoader.h"
+#import "RCTLinkingManager.h"
+#import "RCTRootView.h"

@interface AppDelegate() <RCTBridgeDelegate>

@@ -56,8 +52,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;
 }


@@ -69,48 +70,10 @@
 }

 - (void)loadSourceForBridge:(RCTBridge *)bridge
-                 onProgress:(RCTSourceLoadProgressBlock)onProgress
-                 onComplete:(RCTSourceLoadBlock)loadCallback
+                  withBlock:(RCTSourceLoadBlock)loadCallback
 {
  [RCTJavaScriptLoader loadBundleAtURL:[self sourceURLForBridge:bridge]
-                            onProgress:onProgress
                            onComplete:loadCallback];
 }

-# pragma mark - Push Notifications
-
-#if !TARGET_OS_TV
-
-// Required to register for notifications
- (void)application:(__unused UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
-{
-  [RCTPushNotificationManager didRegisterUserNotificationSettings:notificationSettings];
-}
-
-// Required for the remoteNotificationsRegistered event.
- (void)application:(__unused UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
-{
-  [RCTPushNotificationManager didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
-}
-
-// Required for the remoteNotificationRegistrationError event.
- (void)application:(__unused UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
-{
-  [RCTPushNotificationManager didFailToRegisterForRemoteNotificationsWithError:error];
-}
-
-// Required for the remoteNotificationReceived event.
- (void)application:(__unused UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)notification
-{
-  [RCTPushNotificationManager didReceiveRemoteNotification:notification];
-}
-
-// Required for the localNotificationReceived event.
- (void)application:(__unused UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
-{
-  [RCTPushNotificationManager didReceiveLocalNotification:notification];
-}
-
-#endif
-
@end
@@ -1,15 +1,5 @@
 {
  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "3x"
-    },
    {
      "size" : "29x29",
      "idiom" : "iphone",
@@ -51,4 +41,4 @@
    "version" : 1,
    "author" : "xcode"
  }
-}
+}
@@ -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"
+  }
+}
@@ -2,11 +2,11 @@
  "images" : [
    {
      "idiom" : "universal",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "red_square.png"
    },
    {
      "idiom" : "universal",
-      "filename" : "react-logo.png",
      "scale" : "2x"
    },
    {
@@ -13,8 +13,7 @@
 */

 #import <UIKit/UIKit.h>
-
-#import <React/RCTView.h>
+#import "RCTView.h"

@interface FlexibleSizeExampleView : RCTView

@@ -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

@@ -63,9 +64,7 @@ RCT_EXPORT_MODULE();
    [_resizableRootView setSizeFlexibility:RCTRootViewSizeFlexibilityHeight];

    _currentSizeTextView = [UITextView new];
-#ifndef TARGET_OS_TV
    _currentSizeTextView.editable = NO;
-#endif
    _currentSizeTextView.text = @"Resizable view has not been resized yet";
    _currentSizeTextView.textColor = [UIColor blackColor];
    _currentSizeTextView.backgroundColor = [UIColor whiteColor];
@@ -101,7 +100,7 @@ RCT_EXPORT_MODULE();
 - (void)rootViewDidChangeIntrinsicSize:(RCTRootView *)rootView
 {
  CGRect newFrame = rootView.frame;
-  newFrame.size = rootView.intrinsicContentSize;
+  newFrame.size = rootView.intrinsicSize;

  if (!_sizeUpdated) {
    _sizeUpdated = TRUE;
@@ -13,8 +13,7 @@
 */

 #import <UIKit/UIKit.h>
-
-#import <React/RCTView.h>
+#import "RCTView.h"

@interface UpdatePropertiesExampleView : RCTView

@@ -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
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Facebook. All rights reserved.</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
@@ -13,7 +13,6 @@
 */

 #import <UIKit/UIKit.h>
-
 #import "AppDelegate.h"

 int main(int argc, char * argv[]) {
@@ -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]));
-  }
-}
@@ -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>
@@ -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

@@ -51,6 +51,14 @@
  XCTAssertFalse(_bridge.loading);

  _logSem = dispatch_semaphore_create(0);
+  RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, __unused NSString *fileName, __unused NSNumber *lineNumber, NSString *message) {
+    if (source == RCTLogSourceJavaScript) {
+      self->_lastLogLevel = level;
+      self->_lastLogSource = source;
+      self->_lastLogMessage = message;
+      dispatch_semaphore_signal(self->_logSem);
+    }
+  });
 }

 - (void)tearDown
@@ -63,21 +71,7 @@

 - (void)testLogging
 {
-  // First console log call will fire after 2.0 sec, to allow for any initial log messages
-  // that might come in (seeing this in tvOS)
-  [_bridge enqueueJSCall:@"LoggingTestModule.logToConsoleAfterWait" args:@[@"Invoking console.log",@2000]];
-  // Spin native layer for 1.9 sec
-  [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1.9]];
-  // Now set the log function to signal the semaphore
-  RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, __unused NSString *fileName, __unused NSNumber *lineNumber, NSString *message) {
-    if (source == RCTLogSourceJavaScript) {
-      self->_lastLogLevel = level;
-      self->_lastLogSource = source;
-      self->_lastLogMessage = message;
-      dispatch_semaphore_signal(self->_logSem);
-    }
-  });
-  // Wait for console log to signal the semaphore
+  [_bridge enqueueJSCall:@"LoggingTestModule.logToConsole" args:@[@"Invoking console.log"]];
  dispatch_semaphore_wait(_logSem, DISPATCH_TIME_FOREVER);

  XCTAssertEqual(_lastLogLevel, RCTLogLevelInfo);
@@ -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                               \
@@ -144,7 +147,7 @@ static ControlBlock propertiesUpdateBlock()

 #pragma mark Logic Tests

-// This list should be kept in sync with RCTRootViewIntegrationTestsApp.js
+// This list should be kept in sync with RCTRootViewIntegrationTestApp.js

 // Simple size flexibility tests - test if the content is measured properly
 RCT_TEST_DATA_CONFIGURATION_BLOCK(SizeFlexibilityUpdateTest, SingleUpdate, none, simpleSizeFlexibilityBlock(RCTNone));
@@ -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)

@@ -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)
+//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
@@ -17,6 +17,10 @@

 #import <RCTTest/RCTTestRunner.h>

+#import "RCTAssert.h"
+#import "RCTRedBox.h"
+#import "RCTRootView.h"
+
@interface UIExplorerSnapshotTests : XCTestCase
 {
  RCTTestRunner *_runner;
@@ -43,15 +47,10 @@

 RCT_TEST(ViewExample)
 RCT_TEST(LayoutExample)
-RCT_TEST(ScrollViewExample)
 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

 - (void)testZZZNotInRecordMode
 {
@@ -0,0 +1,79 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+
+#import <OCMock/OCMock.h>
+
+@interface LayoutSubviewsOrderingTest : XCTestCase
+
+@end
+
+@implementation LayoutSubviewsOrderingTest
+
+/**
+ * This test exists to insure that didLayoutSubviews is always called immediately after layoutSubviews for a VC:View
+ * pair. In Catalyst we have multiple levels of ViewController containment, and we rely on this ordering
+ * to insure that layoutGuides are set on RKViewControllers before Views further down in the hierarchy have
+ * their layoutSubviews called (and need to use the aforementioned layoutGuides)
+ */
+- (void)testLayoutSubviewsOrdering
+{
+  // create some Views and ViewControllers
+  UIViewController *parentVC = [UIViewController new];
+  UIView *parentView = [UIView new];
+  UIViewController *childVC = [UIViewController new];
+  UIView *childView = [UIView new];
+
+  // The ordering we expect is:
+  //   parentView::layoutSubviews
+  //   parentVC::didLayoutSubviews
+  //   childView::layoutSubviews
+  //   childVC::didLayoutSubviews
+
+  id parentViewMock = [OCMockObject partialMockForObject:parentView];
+  id parentVCMock = [OCMockObject partialMockForObject:parentVC];
+  id childViewMock = [OCMockObject partialMockForObject:childView];
+  id childVCMock = [OCMockObject partialMockForObject:childVC];
+
+  __block int layoutOrderCount = 0;
+  [[[parentViewMock stub] andDo:^(NSInvocation *inv) {
+    if (layoutOrderCount < 4) {
+      layoutOrderCount++;
+      XCTAssertEqual(layoutOrderCount, 1, @"Expect parentView::layoutSubviews to be called first");
+    }
+  }] layoutSubviews];
+  [[[parentVCMock stub] andDo:^(NSInvocation *inv) {
+    if (layoutOrderCount < 4) {
+      layoutOrderCount++;
+      XCTAssertEqual(layoutOrderCount, 2, @"Expect parentVC::viewDidLayoutSubviews to be called 2nd");
+    }
+  }] viewDidLayoutSubviews];
+  [[[childViewMock stub] andDo:^(NSInvocation *inv) {
+    if (layoutOrderCount < 4) {
+      layoutOrderCount++;
+      XCTAssertEqual(layoutOrderCount, 3, @"Expect childView::layoutSubviews to be called 3rd");
+    }
+  }] layoutSubviews];
+  [[[childVCMock stub] andDo:^(NSInvocation *inv) {
+    if (layoutOrderCount < 4) {
+      layoutOrderCount++;
+      XCTAssertEqual(layoutOrderCount, 4, @"Expect childVC::viewDidLayoutSubviews to be called last");
+      [childVCMock stopMocking];
+    }
+  }] viewDidLayoutSubviews];
+
+  // setup View hierarchy and force layout
+  parentVC.view = parentView;
+  childVC.view = childView;
+  [parentVC addChildViewController:childVC];
+  [childVC didMoveToParentViewController:parentVC];
+  [parentView addSubview:childView];
+
+  [childViewMock setNeedsLayout];
+  [parentViewMock layoutIfNeeded];
+
+  XCTAssertEqual(layoutOrderCount, 4, @"Expect layoutSubviews/viewDidLayoutSubviews to be called");
+}
+
+@end
@@ -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
+
+
+
@@ -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) \
 { \
@@ -85,14 +85,9 @@ RCT_EXPORT_METHOD(test:(__unused NSString *)a

  NSURL *tempDir = [NSURL fileURLWithPath:NSTemporaryDirectory() isDirectory:YES];
  [[NSFileManager defaultManager] createDirectoryAtURL:tempDir withIntermediateDirectories:YES attributes:nil error:NULL];
-  NSString *guid = [[NSProcessInfo processInfo] globallyUniqueString];
-  NSString *fileName = [NSString stringWithFormat:@"rctallocationtests-bundle-%@.js", guid];

-  _bundleURL = [tempDir URLByAppendingPathComponent:fileName];
-  NSError *saveError;
-  if (![bundleContents writeToURL:_bundleURL atomically:YES encoding:NSUTF8StringEncoding error:&saveError]) {
-    XCTFail(@"Failed to save test bundle to %@, error: %@", _bundleURL, saveError);
-  };
+  _bundleURL = [tempDir URLByAppendingPathComponent:@"rctallocationtests-bundle.js"];
+  [bundleContents writeToURL:_bundleURL atomically:YES encoding:NSUTF8StringEncoding error:NULL];
 }

 - (void)tearDown
@@ -213,10 +208,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
@@ -238,7 +230,6 @@ RCT_EXPORT_METHOD(test:(__unused NSString *)a
  // Wait to complete the test until the new batchedbridge is also deallocated
  @autoreleasepool {
    batchedBridge = bridge.batchedBridge;
-    [bridge invalidate];
    bridge = nil;
  }

@@ -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) \
 { \
@@ -33,10 +33,6 @@
  } \
 }

-static const NSUInteger kNameIndex = 0;
-static const NSUInteger kConstantsIndex = 1;
-static const NSUInteger kMethodsIndex = 2;
-
@interface TestExecutor : NSObject <RCTJavaScriptExecutor>

@property (nonatomic, readonly, copy) NSMutableDictionary<NSString *, id> *injectedStuff;
@@ -161,7 +157,7 @@ RCT_EXPORT_MODULE(TestModule)

  _unregisteredTestModule = [UnregisteredTestModule new];
  NSBundle *bundle = [NSBundle bundleForClass:[self class]];
-  _bridge = [[RCTBridge alloc] initWithBundleURL:[bundle URLForResource:@"UIExplorerUnitTestsBundle" withExtension:@"js"]
+  _bridge = [[RCTBridge alloc] initWithBundleURL:[bundle URLForResource:@"TestBundle" withExtension:@"js"]
                                  moduleProvider:^{ return @[self, self->_unregisteredTestModule]; }
                                   launchOptions:nil];

@@ -199,10 +195,10 @@ RCT_EXPORT_MODULE(TestModule)

  NSArray *remoteModuleConfig = RCTJSONParse(injectedStuff, NULL)[@"remoteModuleConfig"];
  [remoteModuleConfig enumerateObjectsUsingBlock:^(id moduleConfig, NSUInteger i, BOOL *stop) {
-    if ([moduleConfig isKindOfClass:[NSArray class]] && [moduleConfig[kNameIndex] isEqualToString:@"TestModule"]) {
+    if ([moduleConfig isKindOfClass:[NSArray class]] && [moduleConfig[0] isEqualToString:@"TestModule"]) {
      testModuleID = @(i);
-      testConstants = moduleConfig[kConstantsIndex];
-      testMethodID = @([moduleConfig[kMethodsIndex] indexOfObject:@"testMethod"]);
+      testConstants = moduleConfig[1];
+      testMethodID = @([moduleConfig[2] indexOfObject:@"testMethod"]);
      *stop = YES;
    }
  }];
@@ -225,9 +221,9 @@ RCT_EXPORT_MODULE(TestModule)

  NSArray *remoteModuleConfig = RCTJSONParse(injectedStuff, NULL)[@"remoteModuleConfig"];
  [remoteModuleConfig enumerateObjectsUsingBlock:^(id moduleConfig, NSUInteger i, __unused BOOL *stop) {
-    if ([moduleConfig isKindOfClass:[NSArray class]] && [moduleConfig[kNameIndex] isEqualToString:@"TestModule"]) {
+    if ([moduleConfig isKindOfClass:[NSArray class]] && [moduleConfig[0] isEqualToString:@"TestModule"]) {
      testModuleID = @(i);
-      testMethodID = @([moduleConfig[kMethodsIndex] indexOfObject:@"testMethod"]);
+      testMethodID = @([moduleConfig[2] indexOfObject:@"testMethod"]);
      *stop = YES;
    }
  }];
@@ -238,7 +234,7 @@ RCT_EXPORT_MODULE(TestModule)
  NSArray *args = @[@1234, @5678, @"stringy", @{@"a": @1}, @42];
  NSArray *buffer = @[@[testModuleID], @[testMethodID], @[args]];

-  [_bridge.batchedBridge handleBuffer:buffer batchEnded:YES];
+  [_bridge.batchedBridge handleBuffer:buffer];

  dispatch_sync(_methodQueue, ^{
    // clear the queue
@@ -257,9 +253,9 @@ RCT_EXPORT_MODULE(TestModule)

  NSArray *remoteModuleConfig = RCTJSONParse(injectedStuff, NULL)[@"remoteModuleConfig"];
  [remoteModuleConfig enumerateObjectsUsingBlock:^(id moduleConfig, NSUInteger i, __unused BOOL *stop) {
-    if ([moduleConfig isKindOfClass:[NSArray class]] && [moduleConfig[kNameIndex] isEqualToString:@"UnregisteredTestModule"]) {
+    if ([moduleConfig isKindOfClass:[NSArray class]] && [moduleConfig[0] isEqualToString:@"UnregisteredTestModule"]) {
      testModuleID = @(i);
-      testMethodID = @([moduleConfig[kMethodsIndex] indexOfObject:@"testMethod"]);
+      testMethodID = @([moduleConfig[1] indexOfObject:@"testMethod"]);
      *stop = YES;
    }
  }];
@@ -270,7 +266,7 @@ RCT_EXPORT_MODULE(TestModule)
  NSArray *args = @[];
  NSArray *buffer = @[@[testModuleID], @[testMethodID], @[args]];

-  [_bridge.batchedBridge handleBuffer:buffer batchEnded:YES];
+  [_bridge.batchedBridge handleBuffer:buffer];

  dispatch_sync(_unregisteredTestModule.methodQueue, ^{
    XCTAssertTrue(self->_unregisteredTestModule.testMethodCalled);
@@ -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";
@@ -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) \
 { \
@@ -96,7 +96,7 @@ RCT_CUSTOM_VIEW_PROPERTY(customProp, NSString, RCTPropsTestView)
  [super setUp];

  NSBundle *bundle = [NSBundle bundleForClass:[self class]];
-  _bridge = [[RCTBridge alloc] initWithBundleURL:[bundle URLForResource:@"UIExplorerUnitTestsBundle" withExtension:@"js"]
+  _bridge = [[RCTBridge alloc] initWithBundleURL:[bundle URLForResource:@"TestBundle" withExtension:@"js"]
                                  moduleProvider:nil
                                   launchOptions:nil];
 }
@@ -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

@@ -1,45 +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>
-
-@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, YGUnitPoint);
-  XCTAssertEqual(value.value, 100);
-}
-
- (void)testStringPercent
-{
-  YGValue value = [RCTConvert YGValue:@"100%"];
-  XCTAssertEqual(value.unit, YGUnitPercent);
-  XCTAssertEqual(value.value, 100);
-}
-
-@end
@@ -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:@"UIExplorerUnitTestsBundle" 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
@@ -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;
@@ -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

@@ -23,12 +24,8 @@

@implementation RCTFontTests

-// It can happen (particularly in tvOS simulator) that expected and result font objects
-// will be different objects, but the same font, so this macro now explicitly
-// checks that fontName (which includes the style) and pointSize are equal.
 #define RCTAssertEqualFonts(font1, font2) { \
-  XCTAssertTrue([font1.fontName isEqualToString:font2.fontName]); \
-  XCTAssertEqual(font1.pointSize,font2.pointSize); \
+  XCTAssertEqualObjects(font1, font2); \
 }

 - (void)testWeight
@@ -66,13 +63,11 @@

 - (void)testFamily
 {
-#if !TARGET_OS_TV
  {
    UIFont *expected = [UIFont fontWithName:@"Cochin" size:14];
    UIFont *result = [RCTConvert UIFont:@{@"fontFamily": @"Cochin"}];
    RCTAssertEqualFonts(expected, result);
  }
-#endif
  {
    UIFont *expected = [UIFont fontWithName:@"HelveticaNeue" size:14];
    UIFont *result = [RCTConvert UIFont:@{@"fontFamily": @"Helvetica Neue"}];
@@ -140,7 +135,6 @@
    UIFont *result = [RCTConvert UIFont:@{@"fontFamily": @"HelveticaNeue-Bold", @"fontWeight": @"normal"}];
    RCTAssertEqualFonts(expected, result);
  }
-#if !TARGET_OS_TV
  {
    UIFont *expected = [UIFont fontWithName:@"Cochin-Bold" size:14];
    UIFont *result = [RCTConvert UIFont:@{@"fontFamily": @"Cochin", @"fontWeight": @"700"}];
@@ -151,7 +145,6 @@
    UIFont *result = [RCTConvert UIFont:@{@"fontFamily": @"Cochin", @"fontWeight": @"100"}];
    RCTAssertEqualFonts(expected, result);
  }
-#endif
 }

 - (void)testFamilyAndStyle
@@ -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) \
 { \
@@ -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);
@@ -47,13 +47,7 @@
  return _canLoadImageURLHandler(requestURL);
 }

- (RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
-                                              size:(CGSize)size
-                                             scale:(CGFloat)scale
-                                        resizeMode:(RCTResizeMode)resizeMode
-                                   progressHandler:(RCTImageLoaderProgressBlock)progressHandler
-                                partialLoadHandler:(__unused RCTImageLoaderPartialLoadBlock)partialLoadHandler
-                                 completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
+- (RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL size:(CGSize)size scale:(CGFloat)scale resizeMode:(RCTResizeMode)resizeMode progressHandler:(RCTImageLoaderProgressBlock)progressHandler completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
 {
  return _loadImageURLHandler(imageURL, size, scale, resizeMode, progressHandler, completionHandler);
 }
@@ -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[] = {
@@ -41,7 +40,7 @@ RCTDefineImageDecoder(RCTImageLoaderTestsDecoder2)
 - (void)setUp
 {
  NSBundle *bundle = [NSBundle bundleForClass:[self class]];
-  _bundleURL = [bundle URLForResource:@"UIExplorerUnitTestsBundle" withExtension:@"js"];
+  _bundleURL = [bundle URLForResource:@"TestBundle" withExtension:@"js"];
 }

 - (void)testImageLoading
@@ -58,11 +57,11 @@ RCTDefineImageDecoder(RCTImageLoaderTestsDecoder2)

  NS_VALID_UNTIL_END_OF_SCOPE RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:_bundleURL moduleProvider:^{ return @[loader]; } launchOptions:nil];

-  NSURLRequest *urlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"https://facebook.github.io/react/img/logo_og.png"]];
+  NSURLRequest *urlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://facebook.github.io/react/img/logo_og.png"]];
  [bridge.imageLoader loadImageWithURLRequest:urlRequest size:CGSizeMake(100, 100) scale:1.0 clipped:YES resizeMode:RCTResizeModeContain progressBlock:^(int64_t progress, int64_t total) {
    XCTAssertEqual(progress, 1);
    XCTAssertEqual(total, 1);
-  } partialLoadBlock:nil completionBlock:^(NSError *loadError, id loadedImage) {
+  } completionBlock:^(NSError *loadError, id loadedImage) {
    XCTAssertEqualObjects(loadedImage, image);
    XCTAssertNil(loadError);
  }];
@@ -89,11 +88,11 @@ RCTDefineImageDecoder(RCTImageLoaderTestsDecoder2)

  NS_VALID_UNTIL_END_OF_SCOPE RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:_bundleURL moduleProvider:^{ return @[loader1, loader2]; } launchOptions:nil];

-  NSURLRequest *urlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"https://facebook.github.io/react/img/logo_og.png"]];
+  NSURLRequest *urlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://facebook.github.io/react/img/logo_og.png"]];
  [bridge.imageLoader loadImageWithURLRequest:urlRequest size:CGSizeMake(100, 100) scale:1.0 clipped:YES resizeMode:RCTResizeModeContain progressBlock:^(int64_t progress, int64_t total) {
    XCTAssertEqual(progress, 1);
    XCTAssertEqual(total, 1);
-  } partialLoadBlock:nil completionBlock:^(NSError *loadError, id loadedImage) {
+  } completionBlock:^(NSError *loadError, id loadedImage) {
    XCTAssertEqualObjects(loadedImage, image);
    XCTAssertNil(loadError);
  }];
@@ -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); \
@@ -16,7 +16,8 @@

 #import <XCTest/XCTest.h>

-#import <React/RCTJSCExecutor.h>
+#import "RCTJSCExecutor.h"
+#import "RCTUtils.h"

@interface RCTJSCExecutorTests : XCTestCase

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mike Grabowski	c18d1dfd7d	[0.33.0] Bump version numbers	2016-09-09 14:58:29 +02:00
James Ide	d7241975c4	[React] Change React version to 15.3.1 (no more RC) React 15.3.1 has been published; stop using the RC.	2016-09-06 22:42:30 -07:00
James Ide	4be85575c0	[0.33.0-rc.1] Bump version numbers	2016-09-06 12:36:04 -07:00
Andrei Coman	4f070e8b64	Fix TextInput contentSize Summary: This fixes some inaccuracies in our reporting of textinput's contentsize. First, we were not using the correct padding info. Then, we are converting the contentSize width and height to ints right before sending them over to JS. This adds some inaccuracy with the textinput behaviour, especially in the case of auto expending text inputs, since those same sizes are then sent right back. Reviewed By: astreet Differential Revision: D3806008 fbshipit-source-id: 7e32f91fde50099fd8a122833fd0042683e68df1	2016-09-06 10:58:56 -07:00
makee	dafe9fc24e	remove incorrect `__unused` modifier Summary: the `update` argument was used below Closes https://github.com/facebook/react-native/pull/9753 Differential Revision: D3820510 fbshipit-source-id: 8cad707a9cd4887c7ee07fe960b1f918761e64c5	2016-09-06 10:58:42 -07:00
Konstantin Raev	5e8b95c815	Fixes paths to robolectric when they are downloaded from maven into buck-out Reviewed By: mmmulani Differential Revision: D3751888 fbshipit-source-id: 2a70e8655f3c6e6dcc2de17e85289d9db18a2699	2016-09-06 12:25:16 +01:00
Jake Murzy	be8c9b8d23	fix NativeAnimated event listener bug Summary: This bugfix cleans up reference to value listener upon unsubscribing to native events ultimately preventing RCTEventEmitter from throwing a [listener count error](https://github.com/facebook/react-native/blob/v0.33.0-rc.0/React/Modules/RCTEventEmitter.m#L90): `Attempted to remove more RCTNativeAnimatedModule listeners than added` /cc janicduplessis sahrens 🍺 Closes https://github.com/facebook/react-native/pull/9729 Differential Revision: D3818241 Pulled By: sahrens fbshipit-source-id: e235e3f97534ef2a50df29877ce36d3b6095237e	2016-09-05 23:42:08 -07:00
Pieter De Baets	7de770abda	Fix crash in RCTJSStackFrame Reviewed By: mmmulani Differential Revision: D3776330 fbshipit-source-id: 0e9126825e86dd7c124bc22341ab3b39b1bd3e0b	2016-09-05 23:40:16 -07:00
Alexander Blom	5501869e3a	Don't clear queue in ProxyExecutor Reviewed By: mhorowitz Differential Revision: D3757216 fbshipit-source-id: 5adda2dcdfb438b65fe668c52e0d2e35705eed9f	2016-09-05 23:40:06 -07:00
Mike Grabowski	fadd5dc98b	[0.33.0-rc.0] Bump version numbers	2016-08-21 11:27:16 +02:00