mirror of
https://github.com/streetwriters/notesnook.git
synced 2026-02-23 19:49:56 +01:00
mobile: remove rn-fetch-blob patch
This commit is contained in:
committed by
Abdullah Atta
parent
cc97b8beed
commit
3ae9001504
@@ -1,103 +0,0 @@
|
||||
diff --git a/node_modules/rn-fetch-blob/android/build.gradle b/node_modules/rn-fetch-blob/android/build.gradle
|
||||
index a4ca7a4..4fd3cfa 100644
|
||||
--- a/node_modules/rn-fetch-blob/android/build.gradle
|
||||
+++ b/node_modules/rn-fetch-blob/android/build.gradle
|
||||
@@ -41,6 +41,7 @@ android {
|
||||
|
||||
dependencies {
|
||||
implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
|
||||
- //compile 'com.squareup.okhttp3:okhttp:+'
|
||||
+ implementation 'com.squareup.okhttp3:okhttp:3.4.1'
|
||||
+
|
||||
//{RNFetchBlob_PRE_0.28_DEPDENDENCY}
|
||||
}
|
||||
diff --git a/node_modules/rn-fetch-blob/react-native.config.js b/node_modules/rn-fetch-blob/react-native.config.js
|
||||
deleted file mode 100644
|
||||
index 03c61b6..0000000
|
||||
--- a/node_modules/rn-fetch-blob/react-native.config.js
|
||||
+++ /dev/null
|
||||
@@ -1,7 +0,0 @@
|
||||
-module.exports = {
|
||||
- dependency: {
|
||||
- hooks: {
|
||||
- prelink: 'node ./node_modules/rn-fetch-blob/scripts/prelink.js',
|
||||
- },
|
||||
- },
|
||||
-};
|
||||
diff --git a/node_modules/rn-fetch-blob/scripts/prelink.js b/node_modules/rn-fetch-blob/scripts/prelink.js
|
||||
deleted file mode 100644
|
||||
index e2c3ac4..0000000
|
||||
--- a/node_modules/rn-fetch-blob/scripts/prelink.js
|
||||
+++ /dev/null
|
||||
@@ -1,71 +0,0 @@
|
||||
-try {
|
||||
- var fs = require('fs');
|
||||
- var glob = require('glob');
|
||||
- var addAndroidPermissions = process.env.RNFB_ANDROID_PERMISSIONS == 'true';
|
||||
- var MANIFEST_PATH = glob.sync(process.cwd() + '/android/app/src/main/**/AndroidManifest.xml')[0];
|
||||
- var PACKAGE_JSON = process.cwd() + '/package.json';
|
||||
- var package = JSON.parse(fs.readFileSync(PACKAGE_JSON));
|
||||
- var APP_NAME = package.name;
|
||||
- var PACKAGE_GRADLE = process.cwd() + '/node_modules/rn-fetch-blob/android/build.gradle'
|
||||
- var VERSION = checkVersion();
|
||||
-
|
||||
- console.log('RNFetchBlob detected app version => ' + VERSION);
|
||||
-
|
||||
- if(VERSION < 0.28) {
|
||||
- console.log('You project version is '+ VERSION + ' which may not compatible to rn-fetch-blob 7.0+, please consider upgrade your application template to react-native 0.27+.')
|
||||
- // add OkHttp3 dependency fo pre 0.28 project
|
||||
- var main = fs.readFileSync(PACKAGE_GRADLE);
|
||||
- console.log('adding OkHttp3 dependency to pre 0.28 project .. ')
|
||||
- main = String(main).replace('//{RNFetchBlob_PRE_0.28_DEPDENDENCY}', "compile 'com.squareup.okhttp3:okhttp:3.4.1'");
|
||||
- fs.writeFileSync(PACKAGE_GRADLE, main);
|
||||
- console.log('adding OkHttp3 dependency to pre 0.28 project .. ok')
|
||||
- }
|
||||
-
|
||||
- console.log('Add Android permissions => ' + (addAndroidPermissions == "true"))
|
||||
-
|
||||
- if(addAndroidPermissions) {
|
||||
-
|
||||
- // set file access permission for Android < 6.0
|
||||
- fs.readFile(MANIFEST_PATH, function(err, data) {
|
||||
-
|
||||
- if(err)
|
||||
- console.log('failed to locate AndroidManifest.xml file, you may have to add file access permission manually.');
|
||||
- else {
|
||||
-
|
||||
- console.log('RNFetchBlob patching AndroidManifest.xml .. ');
|
||||
- // append fs permission
|
||||
- data = String(data).replace(
|
||||
- '<uses-permission android:name="android.permission.INTERNET" />',
|
||||
- '<uses-permission android:name="android.permission.INTERNET" />\n <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> '
|
||||
- )
|
||||
- // append DOWNLOAD_COMPLETE intent permission
|
||||
- data = String(data).replace(
|
||||
- '<category android:name="android.intent.category.LAUNCHER" />',
|
||||
- '<category android:name="android.intent.category.LAUNCHER" />\n <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>'
|
||||
- )
|
||||
- fs.writeFileSync(MANIFEST_PATH, data);
|
||||
- console.log('RNFetchBlob patching AndroidManifest.xml .. ok');
|
||||
-
|
||||
- }
|
||||
-
|
||||
- })
|
||||
- }
|
||||
- else {
|
||||
- console.log(
|
||||
- '\033[95mrn-fetch-blob \033[97mwill not automatically add Android permissions after \033[92m0.9.4 '+
|
||||
- '\033[97mplease run the following command if you want to add default permissions :\n\n' +
|
||||
- '\033[96m\tRNFB_ANDROID_PERMISSIONS=true react-native link \n')
|
||||
- }
|
||||
-
|
||||
- function checkVersion() {
|
||||
- console.log('RNFetchBlob checking app version ..');
|
||||
- return parseFloat(/\d\.\d+(?=\.)/.exec(package.dependencies['react-native']));
|
||||
- }
|
||||
-
|
||||
-} catch(err) {
|
||||
- console.log(
|
||||
- '\033[95mrn-fetch-blob\033[97m link \033[91mFAILED \033[97m\nCould not automatically link package :'+
|
||||
- err.stack +
|
||||
- 'please follow the instructions to manually link the library : ' +
|
||||
- '\033[4mhttps://github.com/joltup/rn-fetch-blob/wiki/Manually-Link-Package\n')
|
||||
-}
|
||||
Reference in New Issue
Block a user