From d75521d3ad9243458e74af81b5e645d1c4892f72 Mon Sep 17 00:00:00 2001 From: maulikdhameliya Date: Fri, 8 May 2020 16:25:40 +0530 Subject: [PATCH 1/2] fix errors for react-native 0.62+ --- android/src/main/java/com/philipphecht/RNDocViewerModule.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android/src/main/java/com/philipphecht/RNDocViewerModule.java b/android/src/main/java/com/philipphecht/RNDocViewerModule.java index b1693256..3be67cd8 100644 --- a/android/src/main/java/com/philipphecht/RNDocViewerModule.java +++ b/android/src/main/java/com/philipphecht/RNDocViewerModule.java @@ -9,7 +9,6 @@ import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableArray; -import com.facebook.react.views.webview.ReactWebViewManager; /* bridge react native int size(); @@ -31,7 +30,7 @@ import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import android.content.ActivityNotFoundException; import android.content.Context; @@ -42,7 +41,6 @@ import android.webkit.MimeTypeMap; import android.widget.Toast; import android.util.Log; -import android.webkit.WebView; public class RNDocViewerModule extends ReactContextBaseJavaModule { public static final int ERROR_NO_HANDLER_FOR_DATA_TYPE = 53; From b22d0d724d39ad38605f457ef2fd9f265f257ba7 Mon Sep 17 00:00:00 2001 From: maulikdhameliya Date: Thu, 21 May 2020 18:45:39 +0530 Subject: [PATCH 2/2] fix android release build issue --- android/build.gradle | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ccd521a3..0147bf08 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -11,15 +11,17 @@ buildscript { apply plugin: 'com.android.library' +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + android { - compileSdkVersion 25 - buildToolsVersion "25.0.0" + compileSdkVersion safeExtGet('compileSdkVersion', 28) + buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3') defaultConfig { - minSdkVersion 16 - targetSdkVersion 26 - versionCode 1 - versionName "1.0" + minSdkVersion safeExtGet('minSdkVersion', 16) + targetSdkVersion safeExtGet('targetSdkVersion', 28) } lintOptions { abortOnError false