Skip to content

Commit e83f84f

Browse files
committed
upgrading to sdk 28 and androidx
1 parent e816b02 commit e83f84f

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ buildscript {
1414
google()
1515
}
1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:3.1.4'
17+
classpath 'com.android.tools.build:gradle:3.2.1'
1818
}
1919
}
2020

2121
android {
22-
compileSdkVersion safeExtGet('compileSdkVersion', 26)
23-
buildToolsVersion safeExtGet('buildToolsVersion', '26.0.3')
22+
compileSdkVersion safeExtGet('compileSdkVersion', 28)
23+
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
2424
defaultConfig {
2525
minSdkVersion safeExtGet('minSdkVersion', 16)
26-
targetSdkVersion safeExtGet('targetSdkVersion', 26)
26+
targetSdkVersion safeExtGet('targetSdkVersion', 28)
2727
versionCode 1
2828
versionName "1.0"
2929
}

android/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.enableJetifier=true
2+
android.useAndroidX=true

android/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<application android:label="@string/app_name">
2525

2626
<provider
27-
android:name="android.support.v4.content.FileProvider"
27+
android:name="androidx.core.content.FileProvider"
2828
android:authorities="${applicationId}.provider"
2929
android:exported="false"
3030
android:grantUriPermissions="true">

android/src/main/java/com/RNFetchBlob/RNFetchBlob.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.content.pm.PackageManager;
77
import android.net.Uri;
88
import android.os.Build;
9-
import android.support.v4.content.FileProvider;
9+
import androidx.core.content.FileProvider;
1010
import android.util.SparseArray;
1111

1212
import com.facebook.react.bridge.ActivityEventListener;
@@ -28,7 +28,6 @@
2828
import okhttp3.JavaNetCookieJar;
2929

3030
import java.io.File;
31-
import java.util.HashMap;
3231
import java.util.Map;
3332
import java.util.concurrent.LinkedBlockingQueue;
3433
import java.util.concurrent.ThreadPoolExecutor;

android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.RNFetchBlob;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
44
import android.util.Base64;
55

66
import com.facebook.react.bridge.Arguments;

android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88
import android.database.Cursor;
99
import android.net.Uri;
1010
import android.os.Build;
11-
import android.support.annotation.NonNull;
11+
import androidx.annotation.NonNull;
1212
import android.util.Base64;
1313

1414
import com.RNFetchBlob.Response.RNFetchBlobDefaultResp;
1515
import com.RNFetchBlob.Response.RNFetchBlobFileResp;
1616
import com.facebook.common.logging.FLog;
1717
import com.facebook.react.bridge.Arguments;
1818
import com.facebook.react.bridge.Callback;
19-
import com.facebook.react.bridge.ReactApplicationContext;
2019
import com.facebook.react.bridge.ReadableArray;
2120
import com.facebook.react.bridge.ReadableMap;
2221
import com.facebook.react.bridge.ReadableMapKeySetIterator;

android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.RNFetchBlob.Response;
22

3-
import android.support.annotation.NonNull;
4-
import android.util.Log;
3+
import androidx.annotation.NonNull;
54

65
import com.RNFetchBlob.RNFetchBlobConst;
76
import com.RNFetchBlob.RNFetchBlobProgressConfig;

0 commit comments

Comments
 (0)