status-im
/
react-native-webview
mirror of https://github.com/status-im/react-native-webview.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(android): Migrate to Android X (#520) 

BREAKING CHANGE:
If you override compileSdkVersion<28  it won't work anymore.
This commit is contained in:
Mike Diarmid 2019-05-16 23:33:25 +01:00 committed by Thibault Malbranche
parent 6323d9962d
commit 1d6c88dcf5
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.gradle
View File

@ -119,12 +119,10 @@ repositories {
} }
} }
def support_version = getExtOrDefault('supportLibVersion')
def kotlin_version = getExtOrDefault('kotlinVersion') def kotlin_version = getExtOrDefault('kotlinVersion')
dependencies { dependencies {
//noinspection GradleDynamicVersion //noinspection GradleDynamicVersion
api 'com.facebook.react:react-native:+' api 'com.facebook.react:react-native:+'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "com.android.support:appcompat-v7:$support_version"
} }

2
android/gradle.properties
View File

@ -2,4 +2,4 @@ ReactNativeWebView_kotlinVersion=1.3.11
ReactNativeWebView_compileSdkVersion=28 ReactNativeWebView_compileSdkVersion=28
ReactNativeWebView_buildToolsVersion=28.0.3 ReactNativeWebView_buildToolsVersion=28.0.3
ReactNativeWebView_targetSdkVersion=28 ReactNativeWebView_targetSdkVersion=28
ReactNativeWebView_supportLibVersion=28.0.0 android.useAndroidX=true

2
android/src/main/java/com/reactnativecommunity/webview/RNCWebViewFileProvider.java
View File

@ -1,6 +1,6 @@
package com.reactnativecommunity.webview; package com.reactnativecommunity.webview;
import android.support.v4.content.FileProvider; import androidx.core.content.FileProvider;
/** /**
* Providing a custom {@code FileProvider} prevents manifest {@code <provider>} name collisions. * Providing a custom {@code FileProvider} prevents manifest {@code <provider>} name collisions.

6
android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModule.java
View File

@ -11,9 +11,9 @@ import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.Parcelable; import android.os.Parcelable;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.support.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v4.content.FileProvider; import androidx.core.content.FileProvider;
import android.util.Log; import android.util.Log;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import android.webkit.ValueCallback; import android.webkit.ValueCallback;