summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bower.json2
-rw-r--r--config.xml35
-rwxr-xr-xhooks/after_prepare/030_android_manifest.js29
-rw-r--r--ionic.config.json22
-rw-r--r--package.json48
5 files changed, 55 insertions, 81 deletions
diff --git a/bower.json b/bower.json
index db6aad91..bd68427a 100644
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,5 @@
{
- "name": "zmNinja",
+ "name": "zmninja",
"version": "1.2.44",
"homepage": "https://github.com/pliablepixels/zmNinja",
"private": "true",
diff --git a/config.xml b/config.xml
index b6812eab..ba64183f 100644
--- a/config.xml
+++ b/config.xml
@@ -129,20 +129,23 @@
<plugin name="cordova-plugin-app-version" spec="^0.1.9" />
<plugin name="cordova-plugin-customurlscheme" spec="^4.3.0">
<variable name="URL_SCHEME" value="zmninja" />
+ <variable name="ANDROID_SCHEME" value=" " />
+ <variable name="ANDROID_HOST" value=" " />
+ <variable name="ANDROID_PATHPREFIX" value="/" />
</plugin>
<plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
- <plugin name="cordova-plugin-globalization" spec="^1.0.7" />
- <plugin name="cordova-plugin-inappbrowser" spec="^1.7.1" />
+ <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
+ <plugin name="cordova-plugin-inappbrowser" spec="^1.7.2" />
<plugin name="cordova-plugin-insomnia" spec="^4.3.0" />
<plugin name="cordova-plugin-pin-dialog" spec="^0.1.3" />
- <plugin name="cordova-plugin-settings-hook" spec="^0.2.7" />
- <plugin name="cordova-plugin-splashscreen" spec="^4.0.3" />
+ <plugin name="cordova-plugin-splashscreen" spec="^4.1.0" />
<plugin name="cordova-plugin-websocket" spec="^0.12.2" />
- <plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
+ <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-sqlite-storage" spec="^1.5.3" />
- <plugin name="cordova-plugin-touch-id" spec="^3.2.0" />
- <plugin name="cordova-plugin-android-fingerprint-auth" spec="^1.4.0" />
- <plugin name="cordova-plugin-device" spec="^2.0.1" />
+ <plugin name="cordova-plugin-touch-id" spec="^3.4.0" />
+ <plugin name="cordova-plugin-android-fingerprint-auth" spec="^1.5.0" />
+ <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
+ <plugin name="cordova-plugin-device" spec="^2.0.2" />
<plugin name="cordova-plugin-file" spec="^6.0.1" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-library-helper-pp-fork" spec="^1.0.1" />
@@ -151,17 +154,19 @@
<plugin name="cordova-plugin-cloud-settings" spec="^1.0.4">
<variable name="ANDROID_BACKUP_SERVICE_KEY" value="AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw" />
</plugin>
- <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.2" />
+ <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.3" />
<plugin name="cordova-plugin-photo-library" spec="git+https://github.com/pliablepixels/cordova-plugin-photo-library.git">
<variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="Save image alarms todisk" />
</plugin>
- <plugin name="cordova-plugin-advanced-http" spec="^2.0.1" />
- <plugin name="phonegap-plugin-push" spec="~2.1.3">
- <variable name="FCM_VERSION" value="11.6.2" />
+ <plugin name="cordova-plugin-advanced-http" spec="^2.0.2" />
+ <plugin name="cordova-plugin-advanced-websocket" spec="^1.1.4" />
+ <plugin name="cordova-plugin-x-socialsharing" spec="^5.4.3">
+ <variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.1+" />
</plugin>
- <plugin name="cordova-plugin-advanced-websocket" spec="^1.1.3" />
- <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
- <plugin name="cordova-plugin-x-socialsharing" spec="^5.4.1" />
<plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
<plugin name="cordova-plugin-certificates-pp-fork" spec="^0.9.1" />
+ <plugin name="phonegap-plugin-push" spec="~2.2.3">
+ <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
+ <variable name="FCM_VERSION" value="11.6.2" />
+ </plugin>
</widget>
diff --git a/hooks/after_prepare/030_android_manifest.js b/hooks/after_prepare/030_android_manifest.js
deleted file mode 100755
index c5590376..00000000
--- a/hooks/after_prepare/030_android_manifest.js
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env node
-
-var fs = require('fs');
-var async = require('async');
-var exec = require('child_process').exec;
-var path = require('path');
-
-var root = process.argv[2];
-var androidManifest = path.join(root, 'platforms/android/AndroidManifest.xml');
-fs.exists(path.join(root, 'platforms/android'), function(exists) {
- if(!exists) return;
- fs.readFile(androidManifest, 'utf8', function(err, data) {
- if(err) throw err;
-
- var lines = data.split('\n');
- var searchingFor = '<application android:hardwareAccelerated="true"';
- var newManifest = [];
- var largeHeap = 'android:largeHeap="true"';
- lines.forEach(function(line) {
- if(line.trim().indexOf(searchingFor) != -1 && line.trim().indexOf(largeHeap) == -1) {
- newManifest.push(line.replace(/\>$/, ' ') + largeHeap + ">");
- } else {
- newManifest.push(line);
- }
- });
-
- fs.writeFileSync(androidManifest, newManifest.join('\n'));
- });
-}); \ No newline at end of file
diff --git a/ionic.config.json b/ionic.config.json
index ee504b0c..c94d7331 100644
--- a/ionic.config.json
+++ b/ionic.config.json
@@ -1,32 +1,26 @@
{
"name": "zmNinja",
- "app_id": "",
- "type": "ionic1",
"integrations": {
- "gulp": {},
"cordova": {}
},
-"proxies": [
+ "type": "ionic1",
+ "proxies": [
{
"path": "/zm",
"proxyUrl": "yourpath1",
"rejectUnauthorized": false
},
{
- "path":"/zm2",
- "proxyUrl":"yourpath2",
- "rejectUnauthorized":false
-
+ "path": "/zm2",
+ "proxyUrl": "yourpath2",
+ "rejectUnauthorized": false
},
{
- "path":"/zm3",
- "proxyUrl":"yourpath3",
- "rejectUnauthorized":false
-
+ "path": "/zm3",
+ "proxyUrl": "yourpath3",
+ "rejectUnauthorized": false
}
-
],
-
"watchPatterns": [
"scss/**/*",
"www/**/*",
diff --git a/package.json b/package.json
index 5a8d89af..df704e60 100644
--- a/package.json
+++ b/package.json
@@ -12,14 +12,16 @@
"cordova-plugin-android-permissions": {},
"cordova-plugin-app-version": {},
"cordova-plugin-customurlscheme": {
- "URL_SCHEME": "zmninja"
+ "URL_SCHEME": "zmninja",
+ "ANDROID_SCHEME": " ",
+ "ANDROID_HOST": " ",
+ "ANDROID_PATHPREFIX": "/"
},
"cordova-plugin-file-transfer": {},
"cordova-plugin-globalization": {},
"cordova-plugin-inappbrowser": {},
"cordova-plugin-insomnia": {},
"cordova-plugin-pin-dialog": {},
- "cordova-plugin-settings-hook": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-websocket": {},
"cordova-plugin-whitelist": {},
@@ -41,47 +43,49 @@
"PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save image alarms todisk"
},
"cordova-plugin-advanced-http": {},
- "phonegap-plugin-push": {
- "FCM_VERSION": "11.6.2"
- },
"cordova-plugin-advanced-websocket": {},
- "cordova-plugin-x-socialsharing": {},
+ "cordova-plugin-x-socialsharing": {
+ "ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
+ },
"cordova-plugin-media-pp-fork": {},
- "cordova-plugin-certificates-pp-fork": {}
+ "cordova-plugin-certificates-pp-fork": {},
+ "phonegap-plugin-push": {
+ "ANDROID_SUPPORT_V13_VERSION": "27.+",
+ "FCM_VERSION": "11.6.2"
+ }
}
},
"dependencies": {
"clivas": "^0.2.0",
"cordova-library-helper-pp-fork": "^1.0.1",
"cordova-plugin-add-swift-support": "^1.7.2",
- "cordova-plugin-advanced-http": "^2.0.1",
- "cordova-plugin-advanced-websocket": "^1.1.3",
- "cordova-plugin-android-fingerprint-auth": "^1.4.0",
+ "cordova-plugin-advanced-http": "^2.0.2",
+ "cordova-plugin-advanced-websocket": "^1.1.4",
+ "cordova-plugin-android-fingerprint-auth": "^1.5.0",
"cordova-plugin-android-permissions": "^1.0.0",
"cordova-plugin-app-version": "^0.1.9",
"cordova-plugin-certificates-pp-fork": "^0.9.1",
"cordova-plugin-cloud-settings": "^1.0.4",
"cordova-plugin-customurlscheme": "^4.3.0",
- "cordova-plugin-device": "^2.0.1",
+ "cordova-plugin-device": "^2.0.2",
"cordova-plugin-file": "^6.0.1",
"cordova-plugin-file-transfer": "^1.7.1",
- "cordova-plugin-globalization": "^1.0.7",
+ "cordova-plugin-globalization": "^1.11.0",
"cordova-plugin-ignore-lint-translation": "0.0.1",
- "cordova-plugin-inappbrowser": "^1.7.1",
+ "cordova-plugin-inappbrowser": "^1.7.2",
"cordova-plugin-insomnia": "^4.3.0",
- "cordova-plugin-ionic-keyboard": "^2.1.2",
+ "cordova-plugin-ionic-keyboard": "^2.1.3",
"cordova-plugin-media-pp-fork": "^1.0.2-dev",
"cordova-plugin-multi-window": "0.0.3",
"cordova-plugin-network-information": "^2.0.1",
"cordova-plugin-photo-library": "git+https://github.com/pliablepixels/cordova-plugin-photo-library.git",
"cordova-plugin-pin-dialog": "^0.1.3",
- "cordova-plugin-settings-hook": "^0.2.7",
- "cordova-plugin-splashscreen": "^4.0.3",
+ "cordova-plugin-splashscreen": "^4.1.0",
"cordova-plugin-statusbar": "^2.4.2",
- "cordova-plugin-touch-id": "^3.2.0",
+ "cordova-plugin-touch-id": "^3.4.0",
"cordova-plugin-websocket": "^0.12.2",
- "cordova-plugin-whitelist": "^1.3.2",
- "cordova-plugin-x-socialsharing": "^5.4.1",
+ "cordova-plugin-whitelist": "^1.3.3",
+ "cordova-plugin-x-socialsharing": "^5.4.3",
"cordova-sqlite-storage": "^1.5.3",
"deep-equal": "^1.0.1",
"electron-window-state": "^4.1.1",
@@ -90,10 +94,10 @@
"keypress": "^0.2.1",
"menu": "^0.2.5",
"minimist": "^1.2.0",
- "mkdirp": "^0.5.1",
- "phonegap-plugin-push": "~2.1.3"
+ "mkdirp": "^0.5.1"
},
"devDependencies": {
+ "@ionic/v1-toolkit": "^1.0.14",
"bower": "^1.8.4",
"electron": "^2.0.8",
"electron-builder": "^20.28.3",
@@ -167,4 +171,4 @@
]
}
}
-}
+} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 09:23:59 +0000