Skip to content
This repository was archived by the owner on Mar 16, 2019. It is now read-only.

Commit c1b8e07

Browse files
committed
Merge branch '0.7.4'
2 parents 22ee1c7 + 944327b commit c1b8e07

File tree

6 files changed

+11
-3
lines changed

6 files changed

+11
-3
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@ RNFetchBlob.config({
614614

615615
| Version | |
616616
|---|---|
617+
| 0.7.4 | Fix app crash problem in version > 0.27 |
617618
| 0.7.3 | Fix OkHttp dependency issue in version < 0.29 |
618619
| 0.7.2 | Fix cancel request bug |
619620
| 0.7.1 | Fix #57 ios module could not compile on ios version <= 9.3 |

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fetchblob",
3-
"version": "0.7.3",
3+
"version": "0.7.4",
44
"private": true,
55
"scripts": {
66
"start": "node node_modules/react-native/local-cli/cli.js start",

src/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ RNFetchBlob.config({
618618

619619
| Version | |
620620
|---|---|
621+
| 0.7.4 | Fix app crash problem in version > 0.27 |
621622
| 0.7.3 | Fix OkHttp dependency issue in version < 0.29 |
622623
| 0.7.2 | Fix cancel request bug |
623624
| 0.7.1 | Fix #57 ios module could not compile on ios version <= 9.3 |

src/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ android {
3434

3535
dependencies {
3636
compile 'com.facebook.react:react-native:+'
37-
compile 'com.squareup.okhttp3:okhttp:3.4.1'
37+
//{RNFetchBlob_PRE_0.29_DEPDENDENCY}
3838
}

src/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-fetch-blob",
3-
"version": "0.7.3",
3+
"version": "0.7.4",
44
"description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
55
"main": "index.js",
66
"scripts": {

src/scripts/prelink.js

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if (!hasNecessaryFile) {
1212
var package = JSON.parse(fs.readFileSync(PACKAGE_JSON));
1313
var APP_NAME = package.name;
1414
var APPLICATION_MAIN = process.cwd() + '/android/app/src/main/java/com/' + APP_NAME.toLocaleLowerCase() + '/MainApplication.java';
15+
var PACKAGE_GRADLE = process.cwd() + '/node_modules/react-native-fetch-blob/android/build.gradle'
1516

1617
var VERSION = checkVersion();
1718
console.log('RNFetchBlob detected app version .. ' + VERSION);
@@ -28,11 +29,16 @@ if(VERSION >= 0.29) {
2829
}
2930
main = String(main).replace('new MainReactPackage()', 'new RNFetchBlobPackage(),\n new MainReactPackage()');
3031
main = String(main).replace('import com.facebook.react.ReactApplication;', 'import com.facebook.react.ReactApplication;\nimport com.RNFetchBlob.RNFetchBlobPackage;')
32+
3133
fs.writeFileSync(APPLICATION_MAIN, main);
3234
console.log('RNFetchBlob patching MainApplication.java .. ok')
3335

3436
}
3537

38+
if(VERSION < 0.27) {
39+
console.log('You project version is '+ VERSION + 'which does not meet requirement of react-native-fetch-blob 7.0+, please upgrade your application template to react-native 0.27+, otherwise Android application will not working.')
40+
}
41+
3642
// set file access permission for Android < 6.0
3743
fs.readFile(MANIFEST_PATH, function(err, data) {
3844

0 commit comments

Comments
 (0)