Androidx support EddyVerbruggen#1039 (restored 6.0.0)

marshallsherman · May 28, 2020 · 850ff5f · 850ff5f
1 parent 8acd1d6
commit 850ff5f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@
 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=eddyverbruggen%40gmail%2ecom&lc=US&item_name=cordova%2dplugin%2dsocialsharing&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)
 Every now and then kind folks ask me how they can give me all their money. So if you want to contribute to my pension fund, then please go ahead :)
 
-> Version 6.0.0 is compatible with Android X. See [this issue](https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin/pull/1039) for details. 5.6.7 is the last version before 6.0.0, so be sure to pick that if you run into Android X-related issues.
+> Version 6.0.0 is compatible with Android X. See [this issue](https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin/pull/1039) for details. 5.6.8 is the last version before 6.0.0, so be sure to pick that if you run into Android X-related issues.
 
 ## 0. Index
 
@@ -538,7 +538,7 @@ To address query schema issue, after installaing the plugin you can edit the iOS
             </array>
         </config-file>
     </platform>
-</widget>        
+</widget>
 ```
 
 The advantage with this method is that editing is done in the config.xml file which will most often be in your source control anyway and hence, changes to it will be reserved.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-x-socialsharing",
-  "version": "5.6.8",
+  "version": "6.0.0",
   "description": "Share text, images (and other files), or a link via the native sharing widget of your device. Android is fully supported, as well as iOS 6 and up. WP8 has somewhat limited support.",
   "cordova": {
     "id": "cordova-plugin-x-socialsharing",

diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-x-socialsharing"
-        version="5.6.8">
+        version="6.0.0">
 
   <name>SocialSharing</name>
 
@@ -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,4 +1,4 @@
 package nl.xservices.plugins;
 
-public class FileProvider extends android.support.v4.content.FileProvider {
+public class FileProvider extends androidx.core.content.FileProvider {
 }