Compare commits

...
Author SHA1 Message Date
Mike Grabowski 2519010b1c [0.35.0] Bump version numbers 2016-10-11 13:25:19 +02:00
Konstantin RaevandMike Grabowski be0bfe70d7 added new property to mock in chalk.js
Summary:
Tests started [failing](https://travis-ci.org/facebook/react-native/jobs/163517412) with release of new  babel that uses chalk.white.bgRed in code.
Jest does not like chalk and needs it mocked.
Removed code duplication and patched the mock.
Closes https://github.com/facebook/react-native/pull/10169

Differential Revision: D3943493

Pulled By: davidaurelio

fbshipit-source-id: 11f57f60ed909a394f15de7b9cc511400aeff510
2016-10-11 13:24:38 +02:00
Konstantin RaevandMike Grabowski c40ba02767 fixed mockito version
Summary:
Gradle unit tests started failing, this PR fixes mockito to be one specific version instead of loose 1.+

**Explain the **motivation** for making this change. What existing problem does the pull request solve?**

Circle CI started failing without any specific reason https://circleci.com/gh/facebook/react-native/tree/master, looks like a dependency error.

Alas it is, I can reproduce the error on master with clean caches.

**Test plan (required)**

After the fix:

```
bestander-pro:react-native bestander$ ./gradlew :ReactAndroid:testDebugUnitTest
Incremental java compilation is an incubating feature.
:ReactAndroid:preBuild UP-TO-DATE
:ReactAndroid:preDebugBuild UP-TO-DATE
:ReactAndroid:checkDebugManifest
:ReactAndroid:preDebugAndroidTestBuild UP-TO-DATE
:ReactAndroid:preDebugUnitTestBuild UP-TO-DATE
:ReactAndroid:preReleaseBuild UP-TO-DATE
:ReactAndroid:preReleaseUnitTestBuild UP-TO-DATE
:ReactAndroid:prepareComAndroidSupportAppcompatV72301Library UP-TO-DATE
:ReactAndroid:prepareComAndro
Closes https://github.com/facebook/react-native/pull/10239

Differential Revision: D3968396

Pulled By: matryoshcow

fbshipit-source-id: 63374261303fb98dc252898dfd5d3b3346597e4f
2016-10-11 13:24:38 +02:00
Héctor RamosandMike Grabowski 492ceb7612 Load React Native Web Player from MaxCDN.
Summary:
unpkg (nee npmcdn) will [no longer serve HTML content with the text/html Content-Type](https://twitter.com/mjackson/status/779147399528718336). We need to switch to another provider to continue supporting the RN Web Player.
Closes https://github.com/facebook/react-native/pull/10072

Differential Revision: D3914585

Pulled By: lacker

fbshipit-source-id: 69833c157775f2b255f1cd11c5b52140d12a27be
2016-10-10 20:20:00 +02:00
Mattias PfeifferandMike Grabowski cf906cc599 Use strong reference in RCTImageLoader
Summary:
This PR is related to the multitude of crashes (#10016, #9751, #9882).

From my understanding, we should be using a strong reference when calling `decodeImageData` or we could be calling the method on a deallocated instance.

PR #9751 have mitigated this by adding a fail-safe, but I think the culprint is the weak reference, which this PR fixes.

Tested on iOS only, since it doesn't touch Android.
Closes https://github.com/facebook/react-native/pull/10147

Differential Revision: D3938763

fbshipit-source-id: 7389d4ae7a98926014401a1fe0cbbdcdd5ee6a01
2016-10-10 20:18:55 +02:00
Mike Grabowski 0f242a1300 [0.35.0-rc.0] Bump version numbers 2016-09-23 15:50:13 +01:00
Mike Grabowski 9fe07ef090 Test bump script 2016-09-23 15:50:00 +01:00
8 changed files with 27 additions and 31 deletions
+1 -1
View File
@@ -553,7 +553,7 @@ static UIImage *RCTResizeImageIfNeeded(UIImage *image,
completionBlock(error_, image);
};
cancelLoad = [weakSelf decodeImageData:imageOrData
cancelLoad = [strongSelf decodeImageData:imageOrData
size:size
scale:scale
clipped:clipped
+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.35.0"
s.summary = package['description']
s.description = <<-DESC
React Native apps are built using the React JS
+2 -2
View File
@@ -1,4 +1,4 @@
VERSION_NAME=1000.0.0-master
VERSION_NAME=0.35.0
GROUP=com.facebook.react
POM_NAME=ReactNative
@@ -7,7 +7,7 @@ POM_PACKAGING=aar
android.useDeprecatedNdk=true
MOCKITO_CORE_VERSION=1.+
MOCKITO_CORE_VERSION=1.10.19
POWERMOCK_VERSION=1.6.2
ROBOLECTRIC_VERSION=3.0
JUNIT_VERSION=4.12
+2 -23
View File
@@ -8,26 +8,5 @@
*/
'use strict';
const mockColor = () => {
return {
bold: () => { return { }; },
};
};
mockColor.bold = function() {
return {};
};
module.exports = {
dim: s => s,
magenta: mockColor,
white: mockColor,
blue: mockColor,
yellow: mockColor,
green: mockColor,
bold: mockColor,
red: mockColor,
cyan: mockColor,
gray: mockColor,
black: mockColor,
};
module.exports =
require('../../packager/react-packager/src/Activity/__mocks__/chalk.js');
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "react-native",
"version": "1000.0.0",
"version": "0.35.0",
"description": "A framework for building native apps using React",
"license": "BSD-3-Clause",
"repository": {
@@ -220,4 +220,4 @@
"shelljs": "0.6.0",
"sinon": "^2.0.0-pre.2"
}
}
}
@@ -18,6 +18,10 @@ mockColor.bold = function() {
return {};
};
mockColor.bgRed = function() {
return {};
};
module.exports = {
dim: s => s,
magenta: mockColor,
+13
View File
@@ -76,5 +76,18 @@ if (exec(`git tag v${version}`).code) {
exit(1);
}
// Push newly created tag
exec(`git push origin v${version}`);
// Tag latest if doing stable release
if (version.indexOf(`rc`) === -1) {
exec(`git tag -d latest`);
exec(`git push origin :latest`);
exec(`git tag latest`);
exec(`git push origin latest`);
}
exec(`git push origin ${branch} --follow-tags`);
exit(0);
/*eslint-enable no-undef */
+2 -2
View File
@@ -12,7 +12,7 @@
var React = require('React');
var Prism = require('Prism');
var WEB_PLAYER_VERSION = '1.1.0';
var WEB_PLAYER_VERSION = '1.2.4';
/**
* Use the WebPlayer by including a ```ReactNativeWebPlayer``` block in markdown.
@@ -59,7 +59,7 @@ var WebPlayer = React.createClass({
style={{marginTop: 4}}
width='880'
height={this.parseParams(this.props.params).platform === 'android' ? '425' : '420'}
data-src={`//npmcdn.com/react-native-web-player@${WEB_PLAYER_VERSION}/index.html${hash}`}
data-src={`//cdn.rawgit.com/dabbott/react-native-web-player/gh-v${WEB_PLAYER_VERSION}/index.html${hash}`}
frameBorder='0'
/>
</div>