From e816b028b126b85c6aa807ec0eff9ddc79077243 Mon Sep 17 00:00:00 2001 From: Greg Alexander Date: Wed, 23 Jan 2019 23:13:25 -0600 Subject: [PATCH 1/3] upgrading to sdk 28 and androidx --- android/gradle.properties | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 android/gradle.properties diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 000000000..e69de29bb From e83f84f1329218c3cf52b99d7a0dbb3a1a8c47d8 Mon Sep 17 00:00:00 2001 From: Greg Alexander Date: Wed, 23 Jan 2019 23:13:52 -0600 Subject: [PATCH 2/3] upgrading to sdk 28 and androidx --- android/build.gradle | 8 ++++---- android/gradle.properties | 2 ++ android/src/main/AndroidManifest.xml | 2 +- android/src/main/java/com/RNFetchBlob/RNFetchBlob.java | 3 +-- .../src/main/java/com/RNFetchBlob/RNFetchBlobBody.java | 2 +- android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java | 3 +-- .../com/RNFetchBlob/Response/RNFetchBlobFileResp.java | 3 +-- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 062f54172..afe1c95ed 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -14,16 +14,16 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.1' } } android { - compileSdkVersion safeExtGet('compileSdkVersion', 26) - buildToolsVersion safeExtGet('buildToolsVersion', '26.0.3') + compileSdkVersion safeExtGet('compileSdkVersion', 28) + buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3') defaultConfig { minSdkVersion safeExtGet('minSdkVersion', 16) - targetSdkVersion safeExtGet('targetSdkVersion', 26) + targetSdkVersion safeExtGet('targetSdkVersion', 28) versionCode 1 versionName "1.0" } diff --git a/android/gradle.properties b/android/gradle.properties index e69de29bb..5465fec0e 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index afa9020b2..b9c03c786 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -24,7 +24,7 @@ diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java index ac9ce5669..f47aef963 100644 --- a/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java +++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java @@ -6,7 +6,7 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import android.util.SparseArray; import com.facebook.react.bridge.ActivityEventListener; @@ -28,7 +28,6 @@ import okhttp3.JavaNetCookieJar; import java.io.File; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java index 3150eb2e8..adbe48b72 100644 --- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java +++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java @@ -1,6 +1,6 @@ package com.RNFetchBlob; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Base64; import com.facebook.react.bridge.Arguments; diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java index 369b9baaf..060538b48 100644 --- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java +++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java @@ -8,7 +8,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Base64; import com.RNFetchBlob.Response.RNFetchBlobDefaultResp; @@ -16,7 +16,6 @@ import com.facebook.common.logging.FLog; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.Callback; -import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableMapKeySetIterator; diff --git a/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java b/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java index e4f725777..7a6acf8e5 100644 --- a/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java +++ b/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java @@ -1,7 +1,6 @@ package com.RNFetchBlob.Response; -import android.support.annotation.NonNull; -import android.util.Log; +import androidx.annotation.NonNull; import com.RNFetchBlob.RNFetchBlobConst; import com.RNFetchBlob.RNFetchBlobProgressConfig; From 27768f470401deb08f281cb9552cf76cc65b495d Mon Sep 17 00:00:00 2001 From: Greg Alexander Date: Thu, 24 Jan 2019 16:38:19 -0600 Subject: [PATCH 3/3] build fix --- android/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index afe1c95ed..a4ca7a421 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,6 +6,8 @@ def safeExtGet(prop, fallback) { repositories { mavenCentral() + jcenter() + google() } buildscript {