diff --git a/.travis.yml b/.travis.yml index aef3ce443..18d353e5b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ android: - tools - platform-tools - tools - - build-tools-27.0.2 - - android-27 + - build-tools-28.0.3 + - android-28 - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository @@ -69,7 +69,7 @@ script: yarn install; ionic cordova build --release android; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -storepass $storepass -keystore radar-armt-release-key.keystore $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk alias_name; - $ANDROID_HOME/build-tools/27.0.2/zipalign -v 4 $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/radar-armt-app-$APP_VERSION.apk; + $ANDROID_HOME/build-tools/28.0.3/zipalign -v 4 $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/radar-armt-app-$APP_VERSION.apk; fastlane supply --apk $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/radar-armt-app-$APP_VERSION.apk --track alpha --json_key service-api.json --package_name $PACKAGE_NAME ; fi # diff --git a/config.xml b/config.xml index fcf3552c4..f60c5d042 100755 --- a/config.xml +++ b/config.xml @@ -98,6 +98,8 @@ - - + + + + diff --git a/package.json b/package.json index 8eb01d46e..4d9729faa 100644 --- a/package.json +++ b/package.json @@ -63,13 +63,15 @@ "autoprefixer": "^9.6.0", "avsc": "^5.4.10", "base64-js": "^1.2.1", - "cordova-android": "^7.1.4", + "cordova-android": "^8.0.0", "cordova-android-support-gradle-release": "^3.0.0", "cordova-lib": "^9.0.1", "cordova-media-with-compression": "^2.1.2", "cordova-plugin-android-permissions": "^1.0.0", + "cordova-plugin-androidx": "^1.0.2", + "cordova-plugin-androidx-adapter": "^1.0.2", "cordova-plugin-app-version": "^0.1.9", - "cordova-plugin-background-mode": "^0.7.2", + "cordova-plugin-background-mode-fixes": "^0.7.4", "cordova-plugin-badge": "^0.8.8", "cordova-plugin-camera": "^4.0.3", "cordova-plugin-device": "^2.0.2", @@ -167,8 +169,9 @@ "cordova-media-with-compression": {}, "cordova-plugin-file": {}, "cordova-plugin-insomnia": {}, - "cordova-plugin-firebase-with-upstream-messaging": {} + "cordova-plugin-firebase-with-upstream-messaging": {}, + "cordova-plugin-background-mode-fixes": {} } }, "ionic_enable_lint": false -} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 650261b66..9dfcbbbac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1213,7 +1213,7 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= -android-versions@1.4.0: +android-versions@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/android-versions/-/android-versions-1.4.0.tgz#807ea2941d7e5780e6dd61c5d9b7b6f3c0706e09" integrity sha512-GnomfYsBq+nZh3c3UH/4r9Jt6FuTxdhUJbeHIdYOH5xBhQ8I0ZzC2/RM5IFFIjrzuNWSHb8JWP1lPK0/a26jrg== @@ -1650,11 +1650,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base64-js@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" - integrity sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE= - base64-js@^1.0.2, base64-js@^1.2.1, base64-js@^1.2.3: version "1.3.0" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3" @@ -1685,11 +1680,6 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -big-integer@1.6.32: - version "1.6.32" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.32.tgz#5867458b25ecd5bcb36b627c30bb501a13c07e89" - integrity sha512-ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw== - big-integer@^1.6.7: version "1.6.43" resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.43.tgz#8ac15bf13e93e509500859061233e19d8d0d99d1" @@ -2596,49 +2586,24 @@ cordova-android-support-gradle-release@^3.0.0: q "^1.4.1" semver "5.6.0" -cordova-android@^7.1.4: - version "7.1.4" - resolved "https://registry.yarnpkg.com/cordova-android/-/cordova-android-7.1.4.tgz#25261ad66cc64f42a30b70be005901fa30e2430e" - integrity sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g== - dependencies: - android-versions "1.4.0" - base64-js "1.2.0" - big-integer "1.6.32" - cordova-common "2.2.5" - elementtree "0.1.6" - glob "5.0.15" - nopt "3.0.1" - path-is-absolute "1.0.1" - plist "2.1.0" - properties-parser "0.2.3" - q "1.4.1" - sax "0.3.5" - semver "5.5.0" - shelljs "0.5.3" - xmlbuilder "8.2.2" +cordova-android@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/cordova-android/-/cordova-android-8.0.0.tgz#1fbe05a914731df619522b9385d4d1b183c36bdb" + integrity sha512-Ipv8HbVJpxEyYFSFLTEOaLRp0yxBtJVNbgSuDEB4naa34FzQaRWSNiiMcPJnO+x3hRXNt7pcwa46hARNzhn7+w== + dependencies: + android-versions "^1.3.0" + cordova-common "^3.1.0" + elementtree "^0.1.7" + nopt "^4.0.1" + properties-parser "^0.3.1" + q "^1.4.1" + shelljs "^0.5.3" cordova-app-hello-world@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/cordova-app-hello-world/-/cordova-app-hello-world-4.0.0.tgz#a30e896b210787332337069c50845e1802dabcff" integrity sha512-hTNYHUJT5YyMa1cQQE1naGyU6Eh5D5Jl33sMnCh3+q15ZwWTL/TOy3k8+mUvjTp8bwhO5eECGKULYoVO+fp9ZA== -cordova-common@2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/cordova-common/-/cordova-common-2.2.5.tgz#f93cef2ad494cfcbf56c46e3d612aaa9cb5fcc32" - integrity sha1-+TzvKtSUz8v1bEbj1hKqqctfzDI= - dependencies: - ansi "^0.3.1" - bplist-parser "^0.1.0" - cordova-registry-mapper "^1.1.8" - elementtree "0.1.6" - glob "^5.0.13" - minimatch "^3.0.0" - plist "^2.1.0" - q "^1.4.1" - shelljs "^0.5.3" - underscore "^1.8.3" - unorm "^1.3.3" - cordova-common@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cordova-common/-/cordova-common-3.1.0.tgz#04dfac1d0e6f8ff1b2467072195679763e9f89b4" @@ -2719,6 +2684,22 @@ cordova-plugin-android-permissions@^1.0.0: resolved "https://registry.yarnpkg.com/cordova-plugin-android-permissions/-/cordova-plugin-android-permissions-1.0.0.tgz#9e7c116be668eb7dfa41491b13d8d47da9548149" integrity sha1-nnwRa+Zo6336QUkbE9jUfalUgUk= +cordova-plugin-androidx-adapter@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.0.2.tgz#b214e25f6a042f8d152e2575219deb6ee82f6cbb" + integrity sha512-ajeH7KdjXC/QR3QflYZbhgrEeMW/s7UFUOuRqDB/KLRB1DScbRBzAO8UyJexfVMDh8tgjwgU0Lg6cMhfB7SlEg== + dependencies: + performance-now "^2.1.0" + q "^1.4.1" + recursive-readdir "^2.2.2" + +cordova-plugin-androidx@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/cordova-plugin-androidx/-/cordova-plugin-androidx-1.0.2.tgz#a48d3fabf20beb4273171fdece0b524362b2643f" + integrity sha512-gA0Ugz3xXRndZ5+QV+T2BjigNt5YraC+uDA/gOEM6p4m4ofwqFAPoHA4Q17VIHnRtn9++OYoa1Gi44+l6blGhA== + dependencies: + q "^1.4.1" + cordova-plugin-app-version@^0.1.9: version "0.1.9" resolved "https://registry.yarnpkg.com/cordova-plugin-app-version/-/cordova-plugin-app-version-0.1.9.tgz#9db0607863337a710489302e5f50a904f1449bdb" @@ -2798,11 +2779,6 @@ cordova-plugin-whitelist@^1.3.3: resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4" integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q= -cordova-registry-mapper@^1.1.8: - version "1.1.15" - resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c" - integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw= - cordova-serve@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cordova-serve/-/cordova-serve-3.0.0.tgz#974d695f75a9f2b3e487604be6f539a39dba8390" @@ -3490,13 +3466,6 @@ electron-to-chromium@^1.3.137: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.144.tgz#d742d2c451090798303a4a5eea4f33f5e60f5d94" integrity sha512-jNRFJpfNrYm5uJ4x0q9oYMOfbL0JPOlkNli8GS/5zEmCjnE5jAtoCo4BYajHiqSPqEeAjtTdItL4p7EZw+jSfg== -elementtree@0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/elementtree/-/elementtree-0.1.6.tgz#2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c" - integrity sha1-KsTEbqMFFsjEy9teOsdBjlkt4gw= - dependencies: - sax "0.3.5" - elementtree@0.1.7, elementtree@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/elementtree/-/elementtree-0.1.7.tgz#9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0" @@ -4584,17 +4553,6 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@5.0.15, glob@^5.0.13: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@7.0.x: version "7.0.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" @@ -6684,7 +6642,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -7036,13 +6994,6 @@ node-sass@4.12.0, node-sass@^4.10.0, node-sass@^4.12.0: dependencies: abbrev "1" -nopt@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.1.tgz#bce5c42446a3291f47622a370abbf158fbbacbfd" - integrity sha1-vOXEJEajKR9HYio3CrvxWPu6y/0= - dependencies: - abbrev "1" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -7591,7 +7542,7 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= -path-is-absolute@1.0.1, path-is-absolute@^1.0.0: +path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= @@ -7719,15 +7670,6 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" -plist@2.1.0, plist@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025" - integrity sha1-V8zbeggh3yGDEhejytVOPhRqECU= - dependencies: - base64-js "1.2.0" - xmlbuilder "8.2.2" - xmldom "0.1.x" - plist@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" @@ -8064,10 +8006,12 @@ promzard@^0.3.0: dependencies: read "1" -properties-parser@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/properties-parser/-/properties-parser-0.2.3.tgz#f7591255f707abbff227c7b56b637dbb0373a10f" - integrity sha1-91kSVfcHq7/yJ8e1a2N9uwNzoQ8= +properties-parser@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/properties-parser/-/properties-parser-0.3.1.tgz#1316e9539ffbfd93845e369b211022abd478771a" + integrity sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo= + dependencies: + string.prototype.codepointat "^0.2.0" protoduck@^5.0.1: version "5.0.1" @@ -8175,11 +8119,6 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -q@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e" - integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4= - q@^1.4.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -8440,6 +8379,13 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" +recursive-readdir@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" + integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg== + dependencies: + minimatch "3.0.4" + redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" @@ -8867,11 +8813,6 @@ sass-loader@7.1.0: pify "^3.0.0" semver "^5.5.0" -sax@0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/sax/-/sax-0.3.5.tgz#88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d" - integrity sha1-iPz8H3PAyLvVt8d2ttPzUB7tBz0= - sax@0.5.x: version "0.5.8" resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1" @@ -8957,11 +8898,6 @@ semver-intersect@1.4.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== -semver@5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== - semver@5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" @@ -9088,7 +9024,7 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= -shelljs@0.5.3, shelljs@^0.5.3: +shelljs@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113" integrity sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM= @@ -9564,6 +9500,11 @@ string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^5.2.0" +string.prototype.codepointat@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc" + integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg== + string.prototype.trim@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea" @@ -10529,11 +10470,6 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -unorm@^1.3.3: - version "1.5.0" - resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a" - integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw== - unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -11114,11 +11050,6 @@ xml2js@^0.4.19: sax ">=0.6.0" xmlbuilder "~9.0.1" -xmlbuilder@8.2.2: - version "8.2.2" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773" - integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M= - xmlbuilder@^9.0.7, xmlbuilder@~9.0.1: version "9.0.7" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"