Skip to content

Commit

Permalink
Revert "Androidx support EddyVerbruggen#1039 (restored 6.0.0)"
Browse files Browse the repository at this point in the history
This reverts commit e7e977c.
  • Loading branch information
elijahr committed Jul 28, 2020
1 parent f8541b7 commit 037b37c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.8 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.7 is the last version before 6.0.0, so be sure to pick that if you run into Android X-related issues.
## 0. Index

Expand Down Expand Up @@ -540,7 +540,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.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-x-socialsharing",
"version": "6.0.0",
"version": "5.6.8",
"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",
Expand Down
5 changes: 3 additions & 2 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="6.0.0">
version="5.6.8">

<name>SocialSharing</name>

Expand Down Expand Up @@ -94,7 +94,8 @@
<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="androidx.legacy:legacy-support-v4:1.0.0" />
<framework src="com.android.support:support-v4:$ANDROID_SUPPORT_V4_VERSION" />
<preference name="ANDROID_SUPPORT_V4_VERSION" default="24.1.1+"/>
</platform>

<!-- wp8 -->
Expand Down
2 changes: 1 addition & 1 deletion src/android/nl/xservices/plugins/FileProvider.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.xservices.plugins;

public class FileProvider extends androidx.core.content.FileProvider {
public class FileProvider extends android.support.v4.content.FileProvider {
}

0 comments on commit 037b37c

Please sign in to comment.