[0.21.0] Bump version numbers

Reviewed By: spicyj

Differential Revision: D2939910

fb-gh-sync-id: 2efe6ecd6d888d4185a8cc74ba9adbe7c68bcd3b
shipit-source-id: 2efe6ecd6d888d4185a8cc74ba9adbe7c68bcd3b

Libraries/Components/ScrollResponder.js

@@ -461,7 +461,7 @@ var ScrollResponderMixin = {
     if (this.preventNegativeScrollOffset) {
       scrollOffsetY = Math.max(0, scrollOffsetY);
     }
-    this.scrollResponderScrollTo(0, scrollOffsetY);
+    this.scrollResponderScrollTo({x: 0, y: scrollOffsetY, animated: true});
 
     this.additionalOffset = 0;
     this.preventNegativeScrollOffset = false;

Libraries/ReactNative/ReactNativeBaseComponent.js

@@ -185,7 +185,11 @@ ReactNativeBaseComponent.Mixin = {
     var tag = ReactNativeTagHandles.allocateTag();
 
     if (__DEV__) {
-      deepFreezeAndThrowOnMutationInDev(this._currentElement.props);
+      for (var key in this.viewConfig.validAttributes) {
+        if (this._currentElement.props.hasOwnProperty(key)) {
+          deepFreezeAndThrowOnMutationInDev(this._currentElement.props[key]);
+        }
+      }
     }
 
     var updatePayload = ReactNativeAttributePayload.create(

React.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = "React"
-  s.version             = "0.0.0-master"
+  s.version             = "0.21.0"
   s.summary             = "Build high quality mobile apps using React."
   s.description         = <<-DESC
                             React Native apps are built using the React JS

ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.12.0-SNAPSHOT
+VERSION_NAME=0.21.0
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java

@@ -274,17 +274,6 @@ public class DevSupportManagerImpl implements DevSupportManager {
             handleReloadJS();
           }
         });
-    options.put(
-            mDevSettings.isHotModuleReplacementEnabled()
-                    ? mApplicationContext.getString(R.string.catalyst_hot_module_replacement_off)
-                    : mApplicationContext.getString(R.string.catalyst_hot_module_replacement),
-            new DevOptionHandler() {
-              @Override
-              public void onOptionSelected() {
-                mDevSettings.setHotModuleReplacementEnabled(!mDevSettings.isHotModuleReplacementEnabled());
-                handleReloadJS();
-              }
-            });
     options.put(
         mDevSettings.isReloadOnJSChangeEnabled()
             ? mApplicationContext.getString(R.string.catalyst_live_reload_off)

local-cli/generator/index.js

@@ -82,13 +82,5 @@ module.exports = yeoman.generators.NamedBase.extend({
         {name: this.name}
       );
     }
-  },
-
-  install: function() {
-    if (this.options.upgrade) {
-      return;
-    }
-
-    this.npmInstall('react', { '--save': true });
   }
 });

local-cli/upgrade/upgrade.js

@@ -44,19 +44,6 @@ module.exports = function upgrade(args, config) {
               'https://github.com/facebook/react-native/releases/tag/v' + semver.major(v) + '.' + semver.minor(v) + '.0'
             )
           );
-
-          // >= v0.21.0, we require react to be a peer depdendency
-          if (semver.gte(v, '0.21.0') && !pak.dependencies['react']) {
-            console.log(
-              chalk.yellow(
-                '\nYour \'package.json\' file doesn\'t seem to have \'react\' as a dependency.\n' +
-                '\'react\' was changed from a dependency to a peer dependency in react-native v0.21.0.\n' +
-                'Therefore, it\'s necessary to include \'react\' in your project\'s dependencies.\n' +
-                'Just run \'npm install --save react\', then re-run \'react-native upgrade\'.\n'
-              )
-            );
-            return Promise.resolve();
-          }
         } else {
           console.log(
             chalk.yellow(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.0.0-master",
+  "version": "0.21.0",
   "description": "A framework for building native apps using React",
   "license": "BSD-3-Clause",
   "repository": {
@@ -92,8 +92,7 @@
     "PATENTS",
     "README.md",
     "jestSupport",
-    ".flowconfig",
-    "npm-shrinkwrap.json"
+    ".flowconfig"
   ],
   "scripts": {
     "test": "NODE_ENV=test jest",
@@ -103,9 +102,6 @@
   "bin": {
     "react-native": "local-cli/wrong-react-native.js"
   },
-  "peerDependencies": {
-    "react": "^0.14.5"
-  },
   "dependencies": {
     "absolute-path": "^0.0.0",
     "art": "^0.10.0",
@@ -137,6 +133,7 @@
     "optimist": "^0.6.1",
     "progress": "^1.1.8",
     "promise": "^7.1.1",
+    "react": "^0.14.5",
     "react-timer-mixin": "^0.13.2",
     "react-transform-hmr": "^1.0.2",
     "rebound": "^0.0.13",

scripts/release.sh

@@ -28,7 +28,6 @@ repo_root=$(pwd)
 git branch | grep -o ${RELEASE}-stable && error "Branch already exists"
 java -version 2>&1 | grep ${JAVA_VERSION} || error "Java version must be 1.7.x in order to generate Javadoc. Check: java -version"
 
-git pull || error "Couldn't pull from remote repository"
 git checkout -b ${RELEASE}-stable || error "Couldn't create branch"
 
 success "Created release branch: ${RELEASE}-stable"

website/core/Header.js

@@ -20,7 +20,7 @@ var Header = React.createClass({
       <H {...this.props}>
         <a className="anchor" name={slug}></a>
         {this.props.children}
-        {' '}<a className="hash-link" href={'#' + slug}>#</a>
+        {' '}<a className="hash-link" href={this.props.path + '#' + slug}>#</a>
       </H>
     );
   }

website/core/Marked.js

@@ -821,6 +821,7 @@ Parser.prototype.tok = function() {
       return (
         <Header
           level={this.token.depth}
+          path={this.options.path}
           toSlug={this.token.text}>
           {this.inline.output(this.token.text)}
         </Header>

website/layout/DocsLayout.js

@@ -30,7 +30,7 @@ var DocsLayout = React.createClass({
               level={1}
               path={'docs/' + metadata.filename}
             />
-            <Marked>{content}</Marked>
+            <Marked path={metadata.permalink}>{content}</Marked>
             <div className="docs-prevnext">
               {metadata.previous && <a className="docs-prev" href={metadata.previous + '.html#content'}>&larr; Prev</a>}
               {metadata.next && <a className="docs-next" href={metadata.next + '.html#content'}>Next &rarr;</a>}