diff --git a/.circleci/config.yml b/.circleci/config.yml
index 843ffd53..e5ef350a 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ aliases:
# JOBS: 1 required to disable workers pools on broccoli as the underlying container reports 36 cores and runs out of memory if trying to spawn 36 threads!
JOBS: 1
- &restore-repo-cache
- key: v1-admin-goodcity-repo-{{ .Environment.CIRCLE_SHA1 }}
+ key: v2-admin-goodcity-repo-{{ .Environment.CIRCLE_SHA1 }}
- &restore-yarn-cache
keys:
- v2-admin-goodcity-yarn-packages-{{ checksum "yarn.lock" }}
@@ -38,15 +38,15 @@ aliases:
paths:
- bower_components
- &restore-bundler-cache
- key: v2-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }}
+ key: v5-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }}
- &save-bundler-cache
- key: v2-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }}
+ key: v5-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }}
paths:
- vendor/bundle
- &restore-ios-bundler-cache
- key: v2-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }}
+ key: v4-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }}
- &save-ios-bundler-cache
- key: v2-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }}
+ key: v4-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }}
paths:
- vendor/bundle
@@ -56,6 +56,7 @@ aliases:
orbs:
azure-cli: circleci/azure-cli@1.2.0
+ ruby: circleci/ruby@2.5.3
jobs:
checkout_code:
@@ -63,7 +64,7 @@ jobs:
steps:
- checkout
- save_cache:
- key: v1-admin-goodcity-repo-{{ .Environment.CIRCLE_SHA1 }}
+ key: v2-admin-goodcity-repo-{{ .Environment.CIRCLE_SHA1 }}
paths:
- ~/code
@@ -119,7 +120,7 @@ jobs:
www_deploy:
<<: *defaults
docker:
- - image: cimg/ruby:2.7.3
+ - image: cimg/ruby:3.4.3
steps:
- restore_cache: *restore-repo-cache
- restore_cache: *restore-bundler-cache
@@ -169,11 +170,13 @@ jobs:
android_build_and_deploy:
<<: *defaults
docker:
- - image: cimg/android:2025.01-browsers
+ - image: cimg/android:2025.08-browsers
environment:
JVM_OPTS: -Xmx3200m
CIRCLE_ARTIFACTS: /home/circleci/code/cordova/platforms/android/build/outputs/apk
steps:
+ - ruby/install:
+ version: '3.4.3'
- restore_cache: *restore-repo-cache
- restore_cache: *restore-yarn-cache
- restore_cache: *restore-bundler-cache
@@ -215,7 +218,7 @@ jobs:
ios_build_and_deploy:
macos:
- xcode: "15.0.0"
+ xcode: "16.4.0"
resource_class: macos.m1.medium.gen1
working_directory: ~/code
shell: /bin/bash --login -eo pipefail
@@ -233,7 +236,7 @@ jobs:
echo 'export ENVIRONMENT=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo production; else echo staging; fi)' >> $BASH_ENV
echo 'export PATH=$PATH:`npm bin`' >> $BASH_ENV
- restore_cache: *restore-ios-bundler-cache
- - run: rbenv local 3.0.6
+ - run: rbenv local 3.4.3
- run: bundle config set --local deployment 'true' && (bundle check || bundle install --jobs=2 --retry=3)
- save_cache: *save-ios-bundler-cache
- run: az login --service-principal --tenant ${AZURE_SP_TENANT} -u ${AZURE_SP} -p ${AZURE_SP_PASSWORD}
diff --git a/.ruby-version b/.ruby-version
index 14dbd377..753ec9c6 100755
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-3.0.6
+ruby-3.4.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 014ae2d4..943576d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
# Admin App
+## v0.26.3
+
+- Updated to Android API 35
+
+## v0.26.2
+
+- Update CI config to Xcode 16
+- Change Ruby versions to 3.3.5
+
+## v0.26.1
+
+- Update Cordova to use Node 22
+
+## v0.26.0
+
+- Update Cordova Android to 13
+- Plugin updates
+- CI config updates
+
## v0.25.0
- Removed yarn offline mirror code for now (wasn't working well with CI builds)
diff --git a/Gemfile b/Gemfile
index 3024ba8f..6827d232 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
source "https://rubygems.org"
+gem "abbrev"
gem "fastlane"
gem "cocoapods"
gem "colorize"
gem "byebug"
-gem 'activesupport', '~> 7.0.8' # pegged for ruby 3 / fastlane 2.219
\ No newline at end of file
+gem 'activesupport'
diff --git a/Gemfile.lock b/Gemfile.lock
index 656db85e..e83879cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,43 +1,59 @@
GEM
remote: https://rubygems.org/
specs:
- CFPropertyList (3.0.6)
+ CFPropertyList (3.0.7)
+ base64
+ nkf
rexml
- activesupport (7.0.8)
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ abbrev (0.1.2)
+ activesupport (7.2.2.2)
+ base64
+ benchmark (>= 0.3)
+ bigdecimal
+ concurrent-ruby (~> 1.0, >= 1.3.1)
+ connection_pool (>= 2.2.5)
+ drb
i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
minitest (>= 5.1)
- tzinfo (~> 2.0)
- addressable (2.8.6)
- public_suffix (>= 2.0.2, < 6.0)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
- artifactory (3.0.15)
+ artifactory (3.0.17)
atomos (0.1.3)
- aws-eventstream (1.3.0)
- aws-partitions (1.884.0)
- aws-sdk-core (3.191.0)
+ aws-eventstream (1.4.0)
+ aws-partitions (1.1161.0)
+ aws-sdk-core (3.232.0)
aws-eventstream (~> 1, >= 1.3.0)
- aws-partitions (~> 1, >= 1.651.0)
- aws-sigv4 (~> 1.8)
+ aws-partitions (~> 1, >= 1.992.0)
+ aws-sigv4 (~> 1.9)
+ base64
+ bigdecimal
jmespath (~> 1, >= 1.6.1)
- aws-sdk-kms (1.77.0)
- aws-sdk-core (~> 3, >= 3.191.0)
- aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.143.0)
- aws-sdk-core (~> 3, >= 3.191.0)
+ logger
+ aws-sdk-kms (1.112.0)
+ aws-sdk-core (~> 3, >= 3.231.0)
+ aws-sigv4 (~> 1.5)
+ aws-sdk-s3 (1.199.0)
+ aws-sdk-core (~> 3, >= 3.231.0)
aws-sdk-kms (~> 1)
- aws-sigv4 (~> 1.8)
- aws-sigv4 (1.8.0)
+ aws-sigv4 (~> 1.5)
+ aws-sigv4 (1.12.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
- byebug (11.1.3)
+ base64 (0.3.0)
+ benchmark (0.4.1)
+ bigdecimal (3.2.3)
+ byebug (12.0.0)
claide (1.1.0)
- cocoapods (1.15.0)
+ cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.15.0)
+ cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -51,8 +67,8 @@ GEM
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
- xcodeproj (>= 1.23.0, < 2.0)
- cocoapods-core (1.15.0)
+ xcodeproj (>= 1.27.0, < 2.0)
+ cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
@@ -76,18 +92,20 @@ GEM
colorize (1.1.0)
commander (4.6.0)
highline (~> 2.0.0)
- concurrent-ruby (1.2.3)
+ concurrent-ruby (1.3.5)
+ connection_pool (2.5.4)
declarative (0.0.20)
- digest-crc (0.6.5)
+ digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
+ drb (2.2.3)
emoji_regex (3.2.3)
escape (0.0.4)
- ethon (0.16.0)
+ ethon (0.17.0)
ffi (>= 1.15.0)
- excon (0.109.0)
- faraday (1.10.3)
+ excon (0.112.0)
+ faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -103,27 +121,27 @@ GEM
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
- faraday-em_synchrony (1.0.0)
+ faraday-em_synchrony (1.0.1)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
- faraday-multipart (1.0.4)
- multipart-post (~> 2)
- faraday-net_http (1.0.1)
+ faraday-multipart (1.1.1)
+ multipart-post (~> 2.0)
+ faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
- faraday_middleware (1.2.0)
+ faraday_middleware (1.2.1)
faraday (~> 1.0)
- fastimage (2.3.0)
- fastlane (2.219.0)
+ fastimage (2.4.0)
+ fastlane (2.228.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
- colored
+ colored (~> 1.2)
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
@@ -132,6 +150,7 @@ GEM
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
+ fastlane-sirp (>= 1.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
@@ -144,10 +163,10 @@ GEM
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
- optparse (>= 0.1.1)
+ optparse (>= 0.1.1, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
- security (= 0.1.3)
+ security (= 0.1.5)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 3)
@@ -155,9 +174,12 @@ GEM
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
- xcpretty (~> 0.3.0)
- xcpretty-travis-formatter (>= 0.0.3)
- ffi (1.16.3)
+ xcpretty (~> 0.4.1)
+ xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+ fastlane-sirp (1.0.0)
+ sysrandom (~> 1.0)
+ ffi (1.17.2)
+ ffi (1.17.2-x86_64-darwin)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
@@ -177,12 +199,12 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
- google-cloud-core (1.6.1)
+ google-cloud-core (1.8.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
- google-cloud-errors (1.3.1)
+ google-cloud-errors (1.5.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
@@ -198,48 +220,55 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
- http-cookie (1.0.5)
+ http-cookie (1.0.8)
domain_name (~> 0.5)
- httpclient (2.8.3)
- i18n (1.14.1)
+ httpclient (2.9.0)
+ mutex_m
+ i18n (1.14.7)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
- json (2.7.1)
- jwt (2.7.1)
- mini_magick (4.12.0)
+ json (2.13.2)
+ jwt (2.10.2)
+ base64
+ logger (1.7.0)
+ mini_magick (4.13.2)
mini_mime (1.1.5)
- minitest (5.21.2)
+ minitest (5.25.5)
molinillo (0.8.0)
- multi_json (1.15.0)
- multipart-post (2.3.0)
- nanaimo (0.3.0)
+ multi_json (1.17.0)
+ multipart-post (2.4.1)
+ mutex_m (0.3.0)
+ nanaimo (0.4.0)
nap (1.1.0)
- naturally (2.2.1)
+ naturally (2.3.0)
netrc (0.11.0)
- optparse (0.4.0)
+ nkf (0.2.0)
+ optparse (0.6.0)
os (1.1.4)
- plist (3.7.1)
+ plist (3.7.2)
public_suffix (4.0.7)
- rake (13.1.0)
+ rake (13.3.0)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
- rexml (3.2.6)
- rouge (2.0.7)
+ rexml (3.4.4)
+ rouge (3.28.0)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
- rubyzip (2.3.2)
- security (0.1.3)
- signet (0.18.0)
+ rubyzip (2.4.1)
+ securerandom (0.4.1)
+ security (0.1.5)
+ signet (0.21.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
- jwt (>= 1.5, < 3.0)
+ jwt (>= 1.5, < 4.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
+ sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
@@ -253,17 +282,17 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
- unicode-display_width (2.5.0)
+ unicode-display_width (2.6.0)
word_wrap (1.0.0)
- xcodeproj (1.24.0)
+ xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
- nanaimo (~> 0.3.0)
- rexml (~> 3.2.4)
- xcpretty (0.3.0)
- rouge (~> 2.0.7)
+ nanaimo (~> 0.4.0)
+ rexml (>= 3.3.6, < 4.0)
+ xcpretty (0.4.1)
+ rouge (~> 3.28.0)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
@@ -272,11 +301,12 @@ PLATFORMS
x86_64-darwin-19
DEPENDENCIES
- activesupport (~> 7.0.8)
+ abbrev
+ activesupport
byebug
cocoapods
colorize
fastlane
BUNDLED WITH
- 2.2.33
+ 2.7.1
diff --git a/README.md b/README.md
index 57929d20..db50a02d 100755
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ rm -rf node_modules/ platforms/ plugins/
yarn
npm install cordova@12
cordova platform remove android
-cordova platform add android@13
+cordova platform add android@14
cordova platform remove ios
cordova platform add ios@7
diff --git a/cordova/config.xml b/cordova/config.xml
index 2f15f6d8..f77afa7b 100755
--- a/cordova/config.xml
+++ b/cordova/config.xml
@@ -24,7 +24,6 @@
-
@@ -44,7 +43,7 @@
-
+
diff --git a/cordova/package-lock.json b/cordova/package-lock.json
index c787def3..58036205 100644
--- a/cordova/package-lock.json
+++ b/cordova/package-lock.json
@@ -13,7 +13,7 @@
"devDependencies": {
"@havesource/cordova-plugin-push": "github:havesource/cordova-plugin-push",
"@steveyken/cordova-plugin-twiliovoicesdk": "github:steveyken/cordova-plugin-twiliovoicesdk",
- "cordova-android": "^13.0.0",
+ "cordova-android": "^14.0.1",
"cordova-ios": "^7.1.1",
"cordova-plugin-actionsheet": "^2.3.3",
"cordova-plugin-android-permissions": "^1.1.5",
@@ -762,9 +762,9 @@
}
},
"node_modules/android-versions": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.0.0.tgz",
- "integrity": "sha512-07fhKL8EjV+ORQggGHcKmhLECwxBlRFimfvsjhfUCYqNDAbcH4qaEaN0AO3DnWtgHqRNfWAxhnWOpx+ZpRMymw==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.1.0.tgz",
+ "integrity": "sha512-oCBvVs2uaL8ohQtesGs78/X7QvFDLbKgTosBRiOIBCss1a/yiakQm/ADuoG2k/AUaI0FfrsFeMl/a+GtEtjEeA==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1447,28 +1447,37 @@
}
},
"node_modules/cordova-android": {
- "version": "13.0.0",
- "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-13.0.0.tgz",
- "integrity": "sha512-uQG+cSyrB1NMi2aIzihldIupHB9WGpZVvrMMMAAtnyc6tDlEk7gweSSaFsEONyGAnteRYpIvrzg/YwDW08PcUg==",
+ "version": "14.0.1",
+ "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-14.0.1.tgz",
+ "integrity": "sha512-HMBMdGu/JlSQtmBuDEpKWf/pE75SpF3FksxZ+mqYuL3qSIN8lN/QsNurwYaPAP7zWXN2DNpvwlpOJItS5VhdLg==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
- "android-versions": "^2.0.0",
- "cordova-common": "^5.0.0",
+ "android-versions": "^2.1.0",
+ "cordova-common": "^5.0.1",
"dedent": "^1.5.3",
"execa": "^5.1.1",
- "fast-glob": "^3.3.2",
- "fs-extra": "^11.2.0",
+ "fast-glob": "^3.3.3",
"is-path-inside": "^3.0.3",
- "nopt": "^7.2.1",
+ "nopt": "^8.1.0",
"properties-parser": "^0.6.0",
- "semver": "^7.6.2",
+ "semver": "^7.7.1",
"string-argv": "^0.3.1",
"untildify": "^4.0.0",
- "which": "^4.0.0"
+ "which": "^5.0.0"
},
"engines": {
- "node": ">=16.13.0"
+ "node": ">=20.5.0"
+ }
+ },
+ "node_modules/cordova-android/node_modules/abbrev": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz",
+ "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": "^18.17.0 || >=20.5.0"
}
},
"node_modules/cordova-android/node_modules/dedent": {
@@ -1496,10 +1505,26 @@
"node": ">=16"
}
},
+ "node_modules/cordova-android/node_modules/nopt": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz",
+ "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "abbrev": "^3.0.0"
+ },
+ "bin": {
+ "nopt": "bin/nopt.js"
+ },
+ "engines": {
+ "node": "^18.17.0 || >=20.5.0"
+ }
+ },
"node_modules/cordova-android/node_modules/which": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
- "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+ "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
"dev": true,
"license": "ISC",
"dependencies": {
@@ -1509,7 +1534,7 @@
"node-which": "bin/which.js"
},
"engines": {
- "node": "^16.13.0 || >=18.0.0"
+ "node": "^18.17.0 || >=20.5.0"
}
},
"node_modules/cordova-app-hello-world": {
@@ -1518,24 +1543,20 @@
"integrity": "sha512-wPZsm+fzNUwdiTRODT+fQuPV410RNmd3Buiw63vT8BPxjC+cn6Bu8emrgwrDM4pbmU5sa5Unwu3xPcbQGQ3G3g=="
},
"node_modules/cordova-common": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-5.0.0.tgz",
- "integrity": "sha512-6Aa7o52/iEvsKx6K94ijzFel5acCULR49KL27OUVhEpJ4oS7Dc3y2eOP1Eu0P4Wmiw/eLEDQjGXGiAa2D5zFZA==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-5.0.1.tgz",
+ "integrity": "sha512-OA2NQ6wvhNz4GytPYwTdlA9xfG7Yf7ufkj4u97m3rUfoL/AECwwj0GVT2CYpk/0Fk6HyuHA3QYCxfDPYsKzI1A==",
+ "license": "Apache-2.0",
"dependencies": {
"@netflix/nerror": "^1.1.3",
"ansi": "^0.3.1",
"bplist-parser": "^0.3.2",
- "cross-spawn": "^7.0.3",
+ "cross-spawn": "^7.0.6",
"elementtree": "^0.1.7",
"endent": "^2.1.0",
- "fast-glob": "^3.2.12",
- "fs-extra": "^11.1.0",
- "glob": "^7.1.6",
- "lodash.assign": "^4.2.0",
- "lodash.isdate": "^4.0.1",
- "lodash.isobject": "^3.0.2",
+ "fast-glob": "^3.3.3",
"lodash.zip": "^4.2.0",
- "plist": "^3.0.6",
+ "plist": "^3.1.0",
"q": "^1.5.1",
"read-chunk": "^3.2.0",
"strip-bom": "^4.0.0"
@@ -1894,9 +1915,10 @@
"integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
},
"node_modules/cross-spawn": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
- "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+ "license": "MIT",
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
@@ -3477,26 +3499,11 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
- "node_modules/lodash.assign": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
- "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw=="
- },
"node_modules/lodash.debounce": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
},
- "node_modules/lodash.isdate": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/lodash.isdate/-/lodash.isdate-4.0.1.tgz",
- "integrity": "sha512-hg5B1GD+R9egsBgMwmAhk+V53Us03TVvXT4dnyKugEfsD4QKuG9Wlyvxq8OGy2nu7qVGsh4DRSnMk33hoWBq/Q=="
- },
- "node_modules/lodash.isobject": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
- "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
- },
"node_modules/lodash.zip": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
@@ -5123,9 +5130,9 @@
"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
},
"node_modules/semver": {
- "version": "7.6.3",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
- "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
diff --git a/cordova/package.json b/cordova/package.json
index 1745d26e..95905175 100644
--- a/cordova/package.json
+++ b/cordova/package.json
@@ -8,7 +8,7 @@
"devDependencies": {
"@havesource/cordova-plugin-push": "github:havesource/cordova-plugin-push",
"@steveyken/cordova-plugin-twiliovoicesdk": "github:steveyken/cordova-plugin-twiliovoicesdk",
- "cordova-android": "^13.0.0",
+ "cordova-android": "^14.0.1",
"cordova-ios": "^7.1.1",
"cordova-plugin-actionsheet": "^2.3.3",
"cordova-plugin-android-permissions": "^1.1.5",
diff --git a/cordova/yarn.lock b/cordova/yarn.lock
index 34ec5b23..dccef8ad 100644
--- a/cordova/yarn.lock
+++ b/cordova/yarn.lock
@@ -260,6 +260,11 @@ abbrev@^2.0.0:
resolved "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz"
integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
+abbrev@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz"
+ integrity sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==
+
abort-controller@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"
@@ -324,10 +329,10 @@ ajv@^8.0.0, ajv@^8.6.3:
require-from-string "^2.0.2"
uri-js "^4.2.2"
-android-versions@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/android-versions/-/android-versions-2.0.0.tgz"
- integrity sha512-07fhKL8EjV+ORQggGHcKmhLECwxBlRFimfvsjhfUCYqNDAbcH4qaEaN0AO3DnWtgHqRNfWAxhnWOpx+ZpRMymw==
+android-versions@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.npmjs.org/android-versions/-/android-versions-2.1.0.tgz"
+ integrity sha512-oCBvVs2uaL8ohQtesGs78/X7QvFDLbKgTosBRiOIBCss1a/yiakQm/ADuoG2k/AUaI0FfrsFeMl/a+GtEtjEeA==
dependencies:
semver "^7.5.2"
@@ -792,49 +797,43 @@ cookie@0.5.0:
resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-cordova-android@^13.0.0:
- version "13.0.0"
- resolved "https://registry.npmjs.org/cordova-android/-/cordova-android-13.0.0.tgz"
- integrity sha512-uQG+cSyrB1NMi2aIzihldIupHB9WGpZVvrMMMAAtnyc6tDlEk7gweSSaFsEONyGAnteRYpIvrzg/YwDW08PcUg==
+cordova-android@^14.0.1:
+ version "14.0.1"
+ resolved "https://registry.npmjs.org/cordova-android/-/cordova-android-14.0.1.tgz"
+ integrity sha512-HMBMdGu/JlSQtmBuDEpKWf/pE75SpF3FksxZ+mqYuL3qSIN8lN/QsNurwYaPAP7zWXN2DNpvwlpOJItS5VhdLg==
dependencies:
- android-versions "^2.0.0"
- cordova-common "^5.0.0"
+ android-versions "^2.1.0"
+ cordova-common "^5.0.1"
dedent "^1.5.3"
execa "^5.1.1"
- fast-glob "^3.3.2"
- fs-extra "^11.2.0"
+ fast-glob "^3.3.3"
is-path-inside "^3.0.3"
- nopt "^7.2.1"
+ nopt "^8.1.0"
properties-parser "^0.6.0"
- semver "^7.6.2"
+ semver "^7.7.1"
string-argv "^0.3.1"
untildify "^4.0.0"
- which "^4.0.0"
+ which "^5.0.0"
cordova-app-hello-world@^6.0.0:
version "6.0.0"
resolved "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-6.0.0.tgz"
integrity sha512-wPZsm+fzNUwdiTRODT+fQuPV410RNmd3Buiw63vT8BPxjC+cn6Bu8emrgwrDM4pbmU5sa5Unwu3xPcbQGQ3G3g==
-cordova-common@^5.0.0:
- version "5.0.0"
- resolved "https://registry.npmjs.org/cordova-common/-/cordova-common-5.0.0.tgz"
- integrity sha512-6Aa7o52/iEvsKx6K94ijzFel5acCULR49KL27OUVhEpJ4oS7Dc3y2eOP1Eu0P4Wmiw/eLEDQjGXGiAa2D5zFZA==
+cordova-common@^5.0.0, cordova-common@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.npmjs.org/cordova-common/-/cordova-common-5.0.1.tgz"
+ integrity sha512-OA2NQ6wvhNz4GytPYwTdlA9xfG7Yf7ufkj4u97m3rUfoL/AECwwj0GVT2CYpk/0Fk6HyuHA3QYCxfDPYsKzI1A==
dependencies:
"@netflix/nerror" "^1.1.3"
ansi "^0.3.1"
bplist-parser "^0.3.2"
- cross-spawn "^7.0.3"
+ cross-spawn "^7.0.6"
elementtree "^0.1.7"
endent "^2.1.0"
- fast-glob "^3.2.12"
- fs-extra "^11.1.0"
- glob "^7.1.6"
- lodash.assign "^4.2.0"
- lodash.isdate "^4.0.1"
- lodash.isobject "^3.0.2"
+ fast-glob "^3.3.3"
lodash.zip "^4.2.0"
- plist "^3.0.6"
+ plist "^3.1.0"
q "^1.5.1"
read-chunk "^3.2.0"
strip-bom "^4.0.0"
@@ -978,10 +977,10 @@ core-util-is@1.0.2:
resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
-cross-spawn@^7.0.0, cross-spawn@^7.0.3:
- version "7.0.3"
- resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
- integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.0, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+ version "7.0.6"
+ resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz"
+ integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
dependencies:
path-key "^3.1.0"
shebang-command "^2.0.0"
@@ -1323,7 +1322,7 @@ fast-deep-equal@^3.1.1:
resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.2:
+fast-glob@^3.2.9, fast-glob@^3.3.3:
version "3.3.3"
resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz"
integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
@@ -1417,7 +1416,7 @@ fresh@0.5.2:
resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
-fs-extra@^11.1.0, fs-extra@^11.1.1, fs-extra@^11.2.0:
+fs-extra@^11.1.0, fs-extra@^11.1.1:
version "11.2.0"
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz"
integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
@@ -1525,7 +1524,7 @@ glob@^10.2.2:
minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
path-scurry "^1.10.1"
-glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.0, glob@^7.1.3, glob@^7.1.4:
version "7.2.0"
resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -1981,26 +1980,11 @@ locate-path@^3.0.0:
p-locate "^3.0.0"
path-exists "^3.0.0"
-lodash.assign@^4.2.0:
- version "4.2.0"
- resolved "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"
- integrity sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==
-
lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
-lodash.isdate@^4.0.1:
- version "4.0.1"
- resolved "https://registry.npmjs.org/lodash.isdate/-/lodash.isdate-4.0.1.tgz"
- integrity sha512-hg5B1GD+R9egsBgMwmAhk+V53Us03TVvXT4dnyKugEfsD4QKuG9Wlyvxq8OGy2nu7qVGsh4DRSnMk33hoWBq/Q==
-
-lodash.isobject@^3.0.2:
- version "3.0.2"
- resolved "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz"
- integrity sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==
-
lodash.zip@^4.2.0:
version "4.2.0"
resolved "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz"
@@ -2302,13 +2286,20 @@ nopt@^6.0.0:
dependencies:
abbrev "^1.0.0"
-nopt@^7.0.0, nopt@^7.1.0, nopt@^7.2.1:
+nopt@^7.0.0, nopt@^7.1.0:
version "7.2.1"
resolved "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz"
integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==
dependencies:
abbrev "^2.0.0"
+nopt@^8.1.0:
+ version "8.1.0"
+ resolved "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz"
+ integrity sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==
+ dependencies:
+ abbrev "^3.0.0"
+
nopt@1.0.9:
version "1.0.9"
resolved "https://registry.npmjs.org/nopt/-/nopt-1.0.9.tgz"
@@ -2647,7 +2638,7 @@ pkg-up@^3.1.0:
dependencies:
find-up "^3.0.0"
-plist@^3.0.1, plist@^3.0.5, plist@^3.0.6:
+plist@^3.0.1, plist@^3.0.5, plist@^3.0.6, plist@^3.1.0:
version "3.1.0"
resolved "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz"
integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
@@ -2966,10 +2957,10 @@ semver@^6.0.0:
resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-semver@^7.0.0, semver@^7.1.1, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.4.0, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3, semver@^7.6.2:
- version "7.6.3"
- resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"
- integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+semver@^7.0.0, semver@^7.1.1, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.4.0, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3, semver@^7.7.1:
+ version "7.7.2"
+ resolved "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz"
+ integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
send@0.18.0:
version "0.18.0"
@@ -3560,6 +3551,13 @@ which@^4.0.0:
dependencies:
isexe "^3.1.1"
+which@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.npmjs.org/which/-/which-5.0.0.tgz"
+ integrity sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==
+ dependencies:
+ isexe "^3.1.1"
+
wide-align@^1.1.5:
version "1.1.5"
resolved "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"
diff --git a/package.json b/package.json
index 853a545b..22655813 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "goodcity",
- "version": "0.26.1",
+ "version": "0.26.3",
"description": "The GoodCity Admin app enables administrators to process donated goods.",
"private": true,
"directories": {