Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
#147 Android fwk tags
Browse files Browse the repository at this point in the history
  • Loading branch information
EddyVerbruggen committed Nov 7, 2015
1 parent 3ae2d02 commit 2ded532
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ window.plugins.googleplus.disconnect(
- A: On Android you need to execute the `keytool` steps, see the installation instructions for details.

## 8. Changelog
4.0.4: Using framework tags again for Android.
4.0.3: On iOS `isAvailable` always returns try since that should be fine with the new Google SignIn framework. Re-added imageUrl to the result of SignIn on iOS.
4.0.1: Login on Android would crash the app if `isAvailable` was invoked beforehand.
4.0.0: Removed the need for `iosApiKey`, reverted Android to Google playservices framework for wider compatibility, documented scopes feature a bit.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "4.0.3",
"version": "4.0.4",
"name": "cordova-plugin-googleplus",
"cordova_name": "Google+",
"description": "Use your Google account to authenticate with the app.",
Expand Down
18 changes: 9 additions & 9 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-googleplus"
version="4.0.3">
version="4.0.4">

<name>Google+</name>

Expand Down Expand Up @@ -30,9 +30,9 @@
<platform name="android">

<!-- these give a lot of peeps trouble, esp on build.phonegap.com, so not using them -->
<!--<framework src="com.google.android.gms:play-services-plus:+" />-->
<!--<framework src="com.google.android.gms:play-services-identity:+" />-->
<dependency id="cordova-plugin-googleplayservices" />
<framework src="com.google.android.gms:play-services-plus:+" />
<framework src="com.google.android.gms:play-services-identity:+" />
<!--<dependency id="cordova-plugin-googleplayservices" />-->

<config-file target="res/xml/config.xml" parent="/*">
<feature name="GooglePlus">
Expand Down Expand Up @@ -104,16 +104,16 @@
</config-file>

<!-- Google frameworks -->
<framework src="src/ios/libs/GoogleOpenSource.framework" custom="true" />
<!--<framework src="src/ios/libs/GoogleOpenSource.framework" custom="true" />-->
<framework src="src/ios/libs/GoogleSignIn.framework" custom="true" />

<!-- System frameworks -->
<framework src="AddressBook.framework" weak="true" />
<framework src="CoreMotion.framework" weak="true" />
<!--<framework src="CoreMotion.framework" weak="true" />-->
<framework src="CoreText.framework" weak="true" />
<framework src="CoreLocation.framework" weak="true" />
<framework src="MediaPlayer.framework" weak="true" />
<framework src="Security.framework" weak="true" />
<!--<framework src="CoreLocation.framework" weak="true" />-->
<!--<framework src="MediaPlayer.framework" weak="true" />-->
<!--<framework src="Security.framework" weak="true" />-->
<framework src="StoreKit.framework" weak="true" />
<framework src="SystemConfiguration.framework" weak="true" />

Expand Down

0 comments on commit 2ded532

Please sign in to comment.