prepare upgrade to cordova-android 7

cordova-android 7 doesn't bundle our nice push icon, need to figure out what's wrong
karrot-dev · Nov 27, 2018 · 44053c2 · 44053c2
1 parent 7093bf6
commit 44053c2
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 33 deletions.
diff --git a/cordova/config/dev/config.xml b/cordova/config/dev/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="world.karrot.dev" version="6.2.6" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="31060" id="world.karrot.dev" version="6.2.6" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Karrot Dev</name>
     <description>
         Mobile app for Karrot - Development version
@@ -30,19 +30,19 @@
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
     </platform>
-    <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
-    <plugin name="cordova-plugin-fcm" spec="^2.1.2" />
-    <plugin name="cordova-universal-links-plugin-fix" spec="^1.2.1" />
     <universal-links>
         <host event="karrot" name="dev.karrot.world" scheme="https">
             <path url="/" />
         </host>
     </universal-links>
-    <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
     <config-file parent="/manifest/application" target="AndroidManifest.xml">
         <meta-data android:name="firebase_analytics_collection_enabled" android:value="false" />
         <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
         <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
     </config-file>
+    <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
+    <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
+    <plugin name="cordova-plugin-fcm-with-dependecy-updated" spec="^2.3.0" />
+    <plugin name="cordova-plugin-deeplinks" spec="^1.1.0" />
     <engine name="android" spec="^6.4.0" />
 </widget>
diff --git a/cordova/config/prod/config.xml b/cordova/config/prod/config.xml
@@ -30,19 +30,19 @@
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
     </platform>
-    <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
-    <plugin name="cordova-plugin-fcm" spec="^2.1.2" />
-    <plugin name="cordova-universal-links-plugin-fix" spec="^1.2.1" />
     <universal-links>
         <host event="karrot" name="karrot.world" scheme="https">
             <path url="/" />
         </host>
     </universal-links>
-    <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
     <config-file parent="/manifest/application" target="AndroidManifest.xml">
         <meta-data android:name="firebase_analytics_collection_enabled" android:value="false" />
         <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
         <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
     </config-file>
-    <engine name="android" spec="^6.4.0" />
+    <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
+    <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
+    <plugin name="cordova-plugin-fcm-with-dependecy-updated" spec="^2.2.6" />
+    <plugin name="cordova-plugin-deeplinks" spec="^1.1.0" />
+    <engine name="android" spec="^7.1.4" />
 </widget>
diff --git a/cordova/package-lock.json b/cordova/package-lock.json
diff --git a/cordova/package.json b/cordova/package.json
@@ -8,18 +8,17 @@
     ],
     "plugins": {
       "cordova-plugin-whitelist": {},
-      "cordova-plugin-fcm": {},
       "cordova-plugin-network-information": {},
-      "cordova-universal-links-plugin-fix": {},
-      "cordova-universal-links-plugin": {}
+      "cordova-plugin-fcm-with-dependecy-updated": {},
+      "cordova-plugin-deeplinks": {}
     }
   },
   "dependencies": {
     "cordova-android": "^6.4.0",
-    "cordova-plugin-fcm": "^2.1.2",
+    "cordova-plugin-deeplinks": "^1.1.0",
+    "cordova-plugin-fcm-with-dependecy-updated": "^2.3.0",
     "cordova-plugin-network-information": "^2.0.1",
     "cordova-plugin-whitelist": "^1.3.3",
-    "cordova-universal-links-plugin-fix": "^1.2.1",
     "fcm": "^1.0.3"
   }
 }
diff --git a/docs/android-sdk.md b/docs/android-sdk.md
@@ -11,7 +11,7 @@ If using Arch Linux there is a [nice page about it](https://wiki.archlinux.org/i
 In summary, install these AUR packages:
 
 ```
-android-platform android-platform-25 android-sdk android-sdk-build-tools android-sdk-platform-tools
+android-platform-27 android-sdk android-sdk-build-tools android-sdk-platform-tools
 ```
 
 Then setup env/path stuff: