Merge pull request #1039 from fluss/master

Androidx support
EddyVerbruggen · May 19, 2020 · 849cb31 · 849cb31
2 parents 9468f0a + d6a3a93
commit 849cb31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -94,8 +94,7 @@
     <source-file src="src/android/nl/xservices/plugins/FileProvider.java" target-dir="src/nl/xservices/plugins"/>
     <source-file src="src/android/res/xml/sharing_paths.xml" target-dir="res/xml"/>
 
-    <framework src="com.android.support:support-v4:$ANDROID_SUPPORT_V4_VERSION" />
-    <preference name="ANDROID_SUPPORT_V4_VERSION" default="24.1.1+"/>
+    <framework src="androidx.legacy:legacy-support-v4:1.0.0" />
   </platform>
 
   <!-- wp8 -->

diff --git a/src/android/nl/xservices/plugins/FileProvider.java b/src/android/nl/xservices/plugins/FileProvider.java
@@ -1,5 +1,5 @@
 package nl.xservices.plugins;
 
 
-public class FileProvider extends android.support.v4.content.FileProvider {
-}
+public class FileProvider extends androidx.core.content.FileProvider {
+}