Compare commits

...
Author SHA1 Message Date
Mike Grabowski ff1c6f98b1 [0.32.0] Bump version numbers 2016-08-21 11:40:21 +02:00
Pieter De Baets 4f5fe812d2 Have React only as a peer dependency
Reviewed By: davidaurelio

Differential Revision: D3683793

fbshipit-source-id: 6ffb8c24e81cfb33b11b9f99d440220287161fb6
2016-08-21 11:38:05 +02:00
Pieter De Baets 0d5fa74c1c Specify React dependency correctly
fbshipit-source-id: c25ad1b942e75d9a631134fc277306931c7bc859
2016-08-21 11:38:01 +02:00
Pieter De Baets 01c78be640 Unbreak upgrade to React 15.3.0
fbshipit-source-id: 0373b4dd11895f3b1c76a904a0a59b70aaa845f9
2016-08-21 11:37:55 +02:00
James Ide be921792cc Use React 15.3.0 instead of 15.3.0-rc.2
Summary:
React 15.3.0 was officially released. We especially should try not depend on RCs in RN releases and npm doesn't handle RC versions well.
Closes https://github.com/facebook/react-native/pull/9279

Differential Revision: D3683587

fbshipit-source-id: fc4f8a030769232b7697434a419e1e07e482e308
2016-08-21 11:37:50 +02:00
Geoffrey Goh c732ca4a95 Fix params patch
Summary:
`this` is a `ReactNativeHost` post RN 0.29, so the current patch doesn't compile. Simply `getResources()` will work for all versions - Post RN 0.29, it will be the method in the outer `MainApplication`, Pre RN 0.29, it will be the method on the `MainActivity`.

grabbou Kureev
Closes https://github.com/facebook/react-native/pull/9381

Differential Revision: D3744162

fbshipit-source-id: 1fa270bb3268b7b40c6160da948d99ff993c83b1
2016-08-21 11:34:00 +02:00
Geoffrey Goh a76dbc50f5 Should be R.string, not R.strings
Summary:
Fix regression of https://github.com/rnpm/rnpm-plugin-link/pull/88.
Closes https://github.com/facebook/react-native/pull/9252

Differential Revision: D3680785

fbshipit-source-id: a6ea63295ae8f61b17c0a1b2ca5e6a5f5da7437a
2016-08-21 11:33:41 +02:00
Mike Grabowski b00f70033a [0.32.0-rc.0] Bump version numbers 2016-08-05 12:16:37 +03:00
5 changed files with 26 additions and 8 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
Pod::Spec.new do |s|
s.name = "React"
s.version = package['version']
s.version = "0.32.0"
s.summary = package['description']
s.description = <<-DESC
React Native apps are built using the React JS
+1 -1
View File
@@ -1,4 +1,4 @@
VERSION_NAME=1000.0.0-master
VERSION_NAME=0.32.0
GROUP=com.facebook.react
POM_NAME=ReactNative
@@ -1,3 +1,12 @@
/**
* 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.
*/
'use strict';
jest.autoMockOff();
@@ -8,7 +17,7 @@ describe('applyParams', () => {
it('apply params to the string', () => {
expect(
applyParams('${foo}', {foo: 'foo'}, 'react-native')
).toEqual('this.getResources().getString(R.strings.reactNative_foo)');
).toEqual('getResources().getString(R.string.reactNative_foo)');
});
it('use null if no params provided', () => {
@@ -1,3 +1,12 @@
/**
* 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.
*/
const toCamelCase = require('lodash').camelCase;
module.exports = function applyParams(str, params, prefix) {
@@ -7,7 +16,7 @@ module.exports = function applyParams(str, params, prefix) {
const name = toCamelCase(prefix) + '_' + param;
return params[param]
? `this.getResources().getString(R.strings.${name})`
? `getResources().getString(R.string.${name})`
: null;
}
);
+4 -4
View File
@@ -1,6 +1,6 @@
{
"name": "react-native",
"version": "1000.0.0",
"version": "0.32.0",
"description": "A framework for building native apps using React",
"license": "BSD-3-Clause",
"repository": {
@@ -124,7 +124,7 @@
"react-native": "local-cli/wrong-react-native.js"
},
"peerDependencies": {
"react": "~15.3.0-rc.2"
"react": "~15.3.0"
},
"dependencies": {
"absolute-path": "^0.0.0",
@@ -207,7 +207,7 @@
"jest-runtime": "~14.1.0",
"mock-fs": "^3.11.0",
"portfinder": "0.4.0",
"react": "~15.3.0-rc.2",
"react": "~15.3.0",
"shelljs": "0.6.0"
}
}
}