Browse Source

Merge branch 'master' into master

Travis Nuttall 5 years ago
parent
commit
aee85fb3bb
No account linked to committer's email address

+ 6
- 4
android/build.gradle View File

6
 
6
 
7
 repositories {
7
 repositories {
8
     mavenCentral()
8
     mavenCentral()
9
+    jcenter()
10
+    google()
9
 }
11
 }
10
 
12
 
11
 buildscript {
13
 buildscript {
14
         google()
16
         google()
15
     }
17
     }
16
     dependencies {
18
     dependencies {
17
-        classpath 'com.android.tools.build:gradle:3.1.4'
19
+        classpath 'com.android.tools.build:gradle:3.2.1'
18
     }
20
     }
19
 }
21
 }
20
 
22
 
21
 android {
23
 android {
22
-    compileSdkVersion safeExtGet('compileSdkVersion', 26)
23
-    buildToolsVersion safeExtGet('buildToolsVersion', '26.0.3')
24
+    compileSdkVersion safeExtGet('compileSdkVersion', 28)
25
+    buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
24
     defaultConfig {
26
     defaultConfig {
25
         minSdkVersion safeExtGet('minSdkVersion', 16)
27
         minSdkVersion safeExtGet('minSdkVersion', 16)
26
-        targetSdkVersion safeExtGet('targetSdkVersion', 26)
28
+        targetSdkVersion safeExtGet('targetSdkVersion', 28)
27
         versionCode 1
29
         versionCode 1
28
         versionName "1.0"
30
         versionName "1.0"
29
     }
31
     }

+ 2
- 0
android/gradle.properties View File

1
+android.enableJetifier=true
2
+android.useAndroidX=true

+ 1
- 2
android/src/main/java/com/RNFetchBlob/RNFetchBlob.java View File

6
 import android.content.pm.PackageManager;
6
 import android.content.pm.PackageManager;
7
 import android.net.Uri;
7
 import android.net.Uri;
8
 import android.os.Build;
8
 import android.os.Build;
9
-import android.support.v4.content.FileProvider;
9
+import androidx.core.content.FileProvider;
10
 import android.util.SparseArray;
10
 import android.util.SparseArray;
11
 
11
 
12
 import com.facebook.react.bridge.ActivityEventListener;
12
 import com.facebook.react.bridge.ActivityEventListener;
28
 import okhttp3.JavaNetCookieJar;
28
 import okhttp3.JavaNetCookieJar;
29
 
29
 
30
 import java.io.File;
30
 import java.io.File;
31
-import java.util.HashMap;
32
 import java.util.Map;
31
 import java.util.Map;
33
 import java.util.concurrent.LinkedBlockingQueue;
32
 import java.util.concurrent.LinkedBlockingQueue;
34
 import java.util.concurrent.ThreadPoolExecutor;
33
 import java.util.concurrent.ThreadPoolExecutor;

+ 1
- 1
android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java View File

1
 package com.RNFetchBlob;
1
 package com.RNFetchBlob;
2
 
2
 
3
-import android.support.annotation.NonNull;
3
+import androidx.annotation.NonNull;
4
 import android.util.Base64;
4
 import android.util.Base64;
5
 
5
 
6
 import com.facebook.react.bridge.Arguments;
6
 import com.facebook.react.bridge.Arguments;

+ 1
- 2
android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java View File

8
 import android.database.Cursor;
8
 import android.database.Cursor;
9
 import android.net.Uri;
9
 import android.net.Uri;
10
 import android.os.Build;
10
 import android.os.Build;
11
-import android.support.annotation.NonNull;
11
+import androidx.annotation.NonNull;
12
 import android.util.Base64;
12
 import android.util.Base64;
13
 
13
 
14
 import com.RNFetchBlob.Response.RNFetchBlobDefaultResp;
14
 import com.RNFetchBlob.Response.RNFetchBlobDefaultResp;
16
 import com.facebook.common.logging.FLog;
16
 import com.facebook.common.logging.FLog;
17
 import com.facebook.react.bridge.Arguments;
17
 import com.facebook.react.bridge.Arguments;
18
 import com.facebook.react.bridge.Callback;
18
 import com.facebook.react.bridge.Callback;
19
-import com.facebook.react.bridge.ReactApplicationContext;
20
 import com.facebook.react.bridge.ReadableArray;
19
 import com.facebook.react.bridge.ReadableArray;
21
 import com.facebook.react.bridge.ReadableMap;
20
 import com.facebook.react.bridge.ReadableMap;
22
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
21
 import com.facebook.react.bridge.ReadableMapKeySetIterator;

+ 1
- 2
android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java View File

1
 package com.RNFetchBlob.Response;
1
 package com.RNFetchBlob.Response;
2
 
2
 
3
-import android.support.annotation.NonNull;
4
-import android.util.Log;
3
+import androidx.annotation.NonNull;
5
 
4
 
6
 import com.RNFetchBlob.RNFetchBlobConst;
5
 import com.RNFetchBlob.RNFetchBlobConst;
7
 import com.RNFetchBlob.RNFetchBlobProgressConfig;
6
 import com.RNFetchBlob.RNFetchBlobProgressConfig;

+ 0
- 1
index.js View File

7
   DeviceEventEmitter,
7
   DeviceEventEmitter,
8
   NativeAppEventEmitter,
8
   NativeAppEventEmitter,
9
   Platform,
9
   Platform,
10
-  AsyncStorage,
11
   AppState,
10
   AppState,
12
 } from 'react-native'
11
 } from 'react-native'
13
 import type {
12
 import type {

+ 1
- 1
rn-fetch-blob.podspec View File

9
   s.author       = 'Joltup'
9
   s.author       = 'Joltup'
10
   s.source_files = 'ios/**/*.{h,m}'
10
   s.source_files = 'ios/**/*.{h,m}'
11
   s.platform     = :ios, "8.0"
11
   s.platform     = :ios, "8.0"
12
-  s.dependency 'React/Core'
12
+  s.dependency 'React-Core'
13
 end
13
 end