Fix Google signin

Freegle · Jul 30, 2019 · 3c22240 · 3c22240
1 parent cd3509b
commit 3c22240
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/dev/webpack.appmt.config.js b/dev/webpack.appmt.config.js
@@ -73,7 +73,7 @@ module.exports = new Config().extend({
     }),
     // CC new FaviconsPlugin('images/modtools_logo.png'),
     new webpack.DefinePlugin({
-      APP_VERSION: JSON.stringify('0.2.15, 15 July 2019.'),
+      APP_VERSION: JSON.stringify('0.2.16, 30 July 2019.'),
       // CC SET ABOVE: API: JSON.stringify(BASE_URL+'/api/'),
       FACEBOOK_APPID: JSON.stringify('134980666550322'),
       FACEBOOK_GRAFFITI_APPID: JSON.stringify('115376591981611'),

diff --git a/mobile/modtools/android/config.xml b/mobile/modtools/android/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="135" id="org.ilovefreegle.modtools" version="0.2.15" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="136" id="org.ilovefreegle.modtools" version="0.2.16" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>ModTools</name>
     <description>Tool to help moderators of Freegle and similar groups</description>
     <author email="[email protected]" href="https://ilovefreegle.org">
@@ -75,7 +75,9 @@
     <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
     <plugin name="cordova-plugin-inappbrowser" spec="^2.0.2" />
     <plugin name="cordova-plugin-geolocation" spec="^4.0.1" />
-    <plugin name="cordova-plugin-googleplus" spec="https://github.com/EddyVerbruggen/cordova-plugin-googleplus" />
+    <plugin name="cordova-plugin-googleplus" spec="https://github.com/EddyVerbruggen/cordova-plugin-googleplus">
+        <variable name="PLAY_SERVICES_VERSION" value="15.0.1" />
+    </plugin>
     <platform name="android">
         <resource-file src="google-services.json" target="app/google-services.json" />
     </platform>
@@ -86,7 +88,7 @@
     <plugin name="cordova-support-google-services" spec="^1.2.1" />
     <plugin name="phonegap-plugin-push" spec="https://github.com/phonegap/phonegap-plugin-push.git">
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
-        <variable name="FCM_VERSION" value="17.0.+" />
+        <variable name="FCM_VERSION" value="15.0.2" />
     </plugin>
     <engine name="android" spec="^8.0.0" />
 </widget>