From b7e65f9d12199b704c09806f829956e5c2a66af8 Mon Sep 17 00:00:00 2001 From: Stanley Date: Thu, 6 Mar 2025 14:43:27 +0800 Subject: [PATCH 01/37] Update XCode for app store iOS target, update ruby version and fastlane --- .circleci/config.yml | 4 +- .ruby-version | 2 +- Gemfile.lock | 139 +++++++++++++++++++++++-------------------- 3 files changed, 79 insertions(+), 66 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 843ffd53..926e44a6 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -215,7 +215,7 @@ jobs: ios_build_and_deploy: macos: - xcode: "15.0.0" + xcode: "16.2.0" resource_class: macos.m1.medium.gen1 working_directory: ~/code shell: /bin/bash --login -eo pipefail @@ -233,7 +233,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.3.5 - 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..f13c6f45 100755 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.0.6 +ruby-3.3.5 diff --git a/Gemfile.lock b/Gemfile.lock index 656db85e..17b812d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,43 +1,47 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml - activesupport (7.0.8) + activesupport (7.0.8.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + 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.3.1) + aws-partitions (1.1061.0) + aws-sdk-core (3.220.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 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) + aws-sdk-kms (1.99.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.182.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sigv4 (1.8.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.2.0) byebug (11.1.3) 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 +55,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,9 +80,9 @@ GEM colorize (1.1.0) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.5) 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) @@ -86,8 +90,8 @@ GEM escape (0.0.4) ethon (0.16.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) @@ -106,24 +110,24 @@ GEM faraday-em_synchrony (1.0.0) 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.0) + 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.226.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 +136,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 +149,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 +160,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.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + ffi (1.17.1) + ffi (1.17.1-x86_64-darwin) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -177,12 +185,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.7.1) 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,41 +206,45 @@ 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.10.1) + jwt (2.10.1) + base64 + mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.21.2) + minitest (5.25.4) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.3.0) - nanaimo (0.3.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + nanaimo (0.4.0) nap (1.1.0) naturally (2.2.1) 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.2.1) 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.1) + 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) + security (0.1.5) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -240,6 +252,7 @@ GEM 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 +266,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.0) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -279,4 +292,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.2.33 + 2.5.16 From 0638af88dc394fd6551665a88a6a4502af8aa65b Mon Sep 17 00:00:00 2001 From: Stanley Date: Thu, 6 Mar 2025 14:45:44 +0800 Subject: [PATCH 02/37] Mod CI for test build --- .circleci/config.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 926e44a6..356f5d1a 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -269,40 +269,40 @@ workflows: - package_dependencies: requires: - checkout_code - - tests: - requires: - - package_dependencies - - www_build: - requires: - - tests - - package_dependencies - filters: - branches: - only: /^(master|live)$/ - - www_deploy: - requires: - - www_build - filters: - branches: - only: /^(master|live)$/ + # - tests: + # requires: + # - package_dependencies + # - www_build: + # requires: + # - tests + # - package_dependencies + # filters: + # branches: + # only: /^(master|live)$/ + # - www_deploy: + # requires: + # - www_build + # filters: + # branches: + # only: /^(master|live)$/ - ember_cordova_build: requires: - - tests + # - tests - package_dependencies filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode)$/ - android_build_and_deploy: requires: - - tests + # - tests - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode)$/ - ios_build_and_deploy: requires: - - tests + # - tests - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode)$/ From fcbc1644c75bfb02d4d14be2bb6daf9c65549b01 Mon Sep 17 00:00:00 2001 From: Stanley Date: Thu, 6 Mar 2025 15:27:46 +0800 Subject: [PATCH 03/37] Remove activesupport 7.0.8 pegging --- Gemfile | 2 +- Gemfile.lock | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 3024ba8f..b4f4a40a 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,4 @@ 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 17b812d0..5b7094b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,11 +5,18 @@ GEM base64 nkf rexml - activesupport (7.0.8.7) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (7.2.2.1) + 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) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) @@ -36,6 +43,8 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) byebug (11.1.3) claide (1.1.0) cocoapods (1.16.2) @@ -81,11 +90,13 @@ GEM commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.3.5) + connection_pool (2.5.0) declarative (0.0.20) digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) + drb (2.2.1) emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) @@ -216,6 +227,7 @@ GEM json (2.10.1) jwt (2.10.1) base64 + logger (1.6.6) mini_magick (4.13.2) mini_mime (1.1.5) minitest (5.25.4) @@ -243,6 +255,7 @@ GEM ruby-macho (2.5.1) ruby2_keywords (0.0.5) rubyzip (2.4.1) + securerandom (0.4.1) security (0.1.5) signet (0.19.0) addressable (~> 2.8) @@ -285,7 +298,7 @@ PLATFORMS x86_64-darwin-19 DEPENDENCIES - activesupport (~> 7.0.8) + activesupport byebug cocoapods colorize From e2ae2f43f05434bf02e8fd568838a359f5c7b263 Mon Sep 17 00:00:00 2001 From: Steve Date: Thu, 6 Mar 2025 16:22:48 +0800 Subject: [PATCH 04/37] Install ruby 3.3.5 on Android build --- .circleci/config.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 356f5d1a..74931944 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,15 +38,15 @@ aliases: paths: - bower_components - &restore-bundler-cache - key: v2-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} + key: v3-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} - &save-bundler-cache - key: v2-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} + key: v3-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} paths: - vendor/bundle - &restore-ios-bundler-cache - key: v2-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} + key: v3-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} - &save-ios-bundler-cache - key: v2-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} + key: v3-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.0 jobs: checkout_code: @@ -174,6 +175,8 @@ jobs: JVM_OPTS: -Xmx3200m CIRCLE_ARTIFACTS: /home/circleci/code/cordova/platforms/android/build/outputs/apk steps: + - ruby/install: + version: '3.3.5' - restore_cache: *restore-repo-cache - restore_cache: *restore-yarn-cache - restore_cache: *restore-bundler-cache From b4c45a272c8e3d0f682179b149eaf43e3aff3a9b Mon Sep 17 00:00:00 2001 From: Stanley Date: Fri, 7 Mar 2025 14:57:37 +0800 Subject: [PATCH 05/37] Update bundler --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5b7094b5..6e37b414 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -305,4 +305,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.5.16 + 2.5.23 From 27cc0d997eeafb0863738ef55cf911f7f0478763 Mon Sep 17 00:00:00 2001 From: Stanley Date: Fri, 7 Mar 2025 15:58:47 +0800 Subject: [PATCH 06/37] Testing with autolibs --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 74931944..0f8353ed 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -177,6 +177,7 @@ jobs: steps: - ruby/install: version: '3.3.5' + - run: rvm autolibs enable && rvm reinstall 3.3.5 - restore_cache: *restore-repo-cache - restore_cache: *restore-yarn-cache - restore_cache: *restore-bundler-cache From 2cd14cac8642aa35fa0a861bf114447fc590e9cd Mon Sep 17 00:00:00 2001 From: Stanley Date: Fri, 7 Mar 2025 16:38:40 +0800 Subject: [PATCH 07/37] Testing without ruby compile --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0f8353ed..bb480cd6 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -175,9 +175,10 @@ jobs: JVM_OPTS: -Xmx3200m CIRCLE_ARTIFACTS: /home/circleci/code/cordova/platforms/android/build/outputs/apk steps: - - ruby/install: - version: '3.3.5' - - run: rvm autolibs enable && rvm reinstall 3.3.5 + - run: + command: "#!/usr/bin/env bash\n\ndetected_platform=\"$(uname -s | tr '[:upper:]' '[:lower:]')\"\nif [ \"$detected_platform\" = \"darwin\" ]; then\n brew install gpg2\nfi\n\n\n# Disable IPv6\nmkdir -p ~/.gnupg/\nfind ~/.gnupg -type d -exec chmod 700 {} \\;\necho \"disable-ipv6\" >> ~/.gnupg/dirmngr.conf\n\n# get keys to validate install https://rvm.io/rvm/security\n# https://stackoverflow.com/questions/69344989/gpg-no-keyserver-available\ndeclare -a keyservers=(\n \"keys.openpgp.org\"\n \"hkp://keyserver.ubuntu.com:80\"\n \"keyserver.ubuntu.com\"\n \"ha.pool.sks-keyservers.net\"\n \"hkp://ha.pool.sks-keyservers.net:80\"\n \"p80.pool.sks-keyservers.net\"\n \"hkp://p80.pool.sks-keyservers.net:80\"\n \"pgp.mit.edu\"\n \"hkp://pgp.mit.edu:80\"\n)\n\ngpg_key_downloaded=\"false\"\nfor server in \"${keyservers[@]}\"; do\n echo \"Fetching GPG keys from ${server}:\"\n \n if gpg --keyserver $server --keyserver-options timeout=10 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \n then\n echo \"- GPG keys successfully added from server '${server}'\"\n gpg_key_downloaded=\"true\"\n break\n else\n echo \"- Network error: Unable to receive GPG keys from server '${server}'.\"\n fi\ndone\nif [ \"$gpg_key_downloaded\" = \"false\" ]; then\n echo \"Unable to receive GPG keys from any of the known GPG keyservers. Trying to import them from rvm.io.\"\n # https://rvm.io/rvm/security#alternatives\n \n if curl -sSL https://rvm.io/mpapis.asc | gpg --import - && curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - \n then\n echo \"- GPG keys successfully imported directly from rvm.io server\"\n else\n echo \"- Could not get keys from rvm.io server either, FAILING\"\n exit 1\n fi\nfi\n\n# https://rvm.io/rvm/security#trust-our-keys\necho 409B6B1796C275462A1703113804BB82D39DC0E3:6: | gpg --import-ownertrust\necho 7D2BAF1CF37B13E2069D6956105BD0E739499BDB:6: | gpg --import-ownertrust\n\n## Update if RVM is installed and exit\nif [ -x \"$(command -v rvm -v)\" ]; then\n rvm get head\n exit 0\nfi\n\ncurl -sSL \"https://get.rvm.io\" | bash -s stable\n\n# check for machine image specific path\nif [ -d /opt/circleci/.rvm ]; then\n echo \"Setting PATH up for system install\"\n # this should be what needs to be added to that $BASH_ENV since this is what's in bash_profile - i dont know when $HOME is set\n echo 'export PATH=$PATH:/opt/circleci/.rvm/bin' >> $BASH_ENV\n echo \"source /opt/circleci/.rvm/scripts/rvm\" >> $BASH_ENV\n # this will source if anyone logs in noninteractively, nvm setup only adds nvm to the path, to get the rubygems later you need to source this again\n echo \"source /opt/circleci/.rvm/scripts/rvm\" >> ~/.bashrc\n echo \"export RVM_HOME=/opt/circleci/.rvm\" >> $BASH_ENV\nelse\n # Most circle builds run as a root user, in which case rvm gets installed in /usr/local/rvm instead of $HOME/.rvm\n RVM_HOME=$HOME/.rvm\n if [ -f \"$RVM_HOME/scripts/rvm\" ]; then\n echo \"Using $RVM_HOME\"\n else\n RVM_HOME=/usr/local/rvm\n echo \"Using $RVM_HOME\"\n fi\n echo \"export RVM_HOME=$RVM_HOME\" >> $BASH_ENV\n\n echo \"Setting PATH up for local install\"\n # this should be what needs to be added to that $BASH_ENV since this is what's in bash_profile - i dont know when $HOME is set\n echo 'export PATH=$PATH:$RVM_HOME/bin' >> $BASH_ENV\n echo \"source $RVM_HOME/scripts/rvm\" >> $BASH_ENV\n # this will source if anyone logs in noninteractively, nvm setup only adds nvm to the path, to get the rubygems later you need to source this again\n echo \"source $RVM_HOME/scripts/rvm\" >> ~/.bashrc\nfi\n\n# check if it seems like they're using rbenv already\nif command -v rbenv &> /dev/null && [ -f \".ruby-version\" ]\nthen\n echo -e \"\\e[91m\"\n cat \\<<'SUGGESTION'\n\n#######################################################################\n# WARNING\n#######################################################################\n\nWe've detected that you're running on a system that has the rbenv ruby\nversion manager already installed, and you have a .ruby-version file in\nthe current working directory.\n\nThe circleci/ruby orb (that's currently executing) uses RVM to install\nruby. Using more than one ruby version manager at once can, depending\non the configuration of your system, cause issues.\n\nTo install ruby with rbenv without using the circleci/ruby's \"install\"\ncommand, you can simply run a step that executes:\n\n rbenv install\n\nWhich will install the version of ruby that is specified in the\n.ruby-version file.\n\n#######################################################################\n\nSUGGESTION\n echo -e \"\\e[0m\"\nfi\n" + name: Install/Verify Ruby Version Manager. + - run: rvm autolibs enable && rvm install 3.3.5 - restore_cache: *restore-repo-cache - restore_cache: *restore-yarn-cache - restore_cache: *restore-bundler-cache From f04a1b3eda38673e59ad35e4d05ac6ed84d04326 Mon Sep 17 00:00:00 2001 From: Stanley Date: Fri, 7 Mar 2025 16:58:51 +0800 Subject: [PATCH 08/37] Trim rvm install script from Steve --- .circleci/config.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb480cd6..31abf638 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,7 +176,14 @@ jobs: CIRCLE_ARTIFACTS: /home/circleci/code/cordova/platforms/android/build/outputs/apk steps: - run: - command: "#!/usr/bin/env bash\n\ndetected_platform=\"$(uname -s | tr '[:upper:]' '[:lower:]')\"\nif [ \"$detected_platform\" = \"darwin\" ]; then\n brew install gpg2\nfi\n\n\n# Disable IPv6\nmkdir -p ~/.gnupg/\nfind ~/.gnupg -type d -exec chmod 700 {} \\;\necho \"disable-ipv6\" >> ~/.gnupg/dirmngr.conf\n\n# get keys to validate install https://rvm.io/rvm/security\n# https://stackoverflow.com/questions/69344989/gpg-no-keyserver-available\ndeclare -a keyservers=(\n \"keys.openpgp.org\"\n \"hkp://keyserver.ubuntu.com:80\"\n \"keyserver.ubuntu.com\"\n \"ha.pool.sks-keyservers.net\"\n \"hkp://ha.pool.sks-keyservers.net:80\"\n \"p80.pool.sks-keyservers.net\"\n \"hkp://p80.pool.sks-keyservers.net:80\"\n \"pgp.mit.edu\"\n \"hkp://pgp.mit.edu:80\"\n)\n\ngpg_key_downloaded=\"false\"\nfor server in \"${keyservers[@]}\"; do\n echo \"Fetching GPG keys from ${server}:\"\n \n if gpg --keyserver $server --keyserver-options timeout=10 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \n then\n echo \"- GPG keys successfully added from server '${server}'\"\n gpg_key_downloaded=\"true\"\n break\n else\n echo \"- Network error: Unable to receive GPG keys from server '${server}'.\"\n fi\ndone\nif [ \"$gpg_key_downloaded\" = \"false\" ]; then\n echo \"Unable to receive GPG keys from any of the known GPG keyservers. Trying to import them from rvm.io.\"\n # https://rvm.io/rvm/security#alternatives\n \n if curl -sSL https://rvm.io/mpapis.asc | gpg --import - && curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - \n then\n echo \"- GPG keys successfully imported directly from rvm.io server\"\n else\n echo \"- Could not get keys from rvm.io server either, FAILING\"\n exit 1\n fi\nfi\n\n# https://rvm.io/rvm/security#trust-our-keys\necho 409B6B1796C275462A1703113804BB82D39DC0E3:6: | gpg --import-ownertrust\necho 7D2BAF1CF37B13E2069D6956105BD0E739499BDB:6: | gpg --import-ownertrust\n\n## Update if RVM is installed and exit\nif [ -x \"$(command -v rvm -v)\" ]; then\n rvm get head\n exit 0\nfi\n\ncurl -sSL \"https://get.rvm.io\" | bash -s stable\n\n# check for machine image specific path\nif [ -d /opt/circleci/.rvm ]; then\n echo \"Setting PATH up for system install\"\n # this should be what needs to be added to that $BASH_ENV since this is what's in bash_profile - i dont know when $HOME is set\n echo 'export PATH=$PATH:/opt/circleci/.rvm/bin' >> $BASH_ENV\n echo \"source /opt/circleci/.rvm/scripts/rvm\" >> $BASH_ENV\n # this will source if anyone logs in noninteractively, nvm setup only adds nvm to the path, to get the rubygems later you need to source this again\n echo \"source /opt/circleci/.rvm/scripts/rvm\" >> ~/.bashrc\n echo \"export RVM_HOME=/opt/circleci/.rvm\" >> $BASH_ENV\nelse\n # Most circle builds run as a root user, in which case rvm gets installed in /usr/local/rvm instead of $HOME/.rvm\n RVM_HOME=$HOME/.rvm\n if [ -f \"$RVM_HOME/scripts/rvm\" ]; then\n echo \"Using $RVM_HOME\"\n else\n RVM_HOME=/usr/local/rvm\n echo \"Using $RVM_HOME\"\n fi\n echo \"export RVM_HOME=$RVM_HOME\" >> $BASH_ENV\n\n echo \"Setting PATH up for local install\"\n # this should be what needs to be added to that $BASH_ENV since this is what's in bash_profile - i dont know when $HOME is set\n echo 'export PATH=$PATH:$RVM_HOME/bin' >> $BASH_ENV\n echo \"source $RVM_HOME/scripts/rvm\" >> $BASH_ENV\n # this will source if anyone logs in noninteractively, nvm setup only adds nvm to the path, to get the rubygems later you need to source this again\n echo \"source $RVM_HOME/scripts/rvm\" >> ~/.bashrc\nfi\n\n# check if it seems like they're using rbenv already\nif command -v rbenv &> /dev/null && [ -f \".ruby-version\" ]\nthen\n echo -e \"\\e[91m\"\n cat \\<<'SUGGESTION'\n\n#######################################################################\n# WARNING\n#######################################################################\n\nWe've detected that you're running on a system that has the rbenv ruby\nversion manager already installed, and you have a .ruby-version file in\nthe current working directory.\n\nThe circleci/ruby orb (that's currently executing) uses RVM to install\nruby. Using more than one ruby version manager at once can, depending\non the configuration of your system, cause issues.\n\nTo install ruby with rbenv without using the circleci/ruby's \"install\"\ncommand, you can simply run a step that executes:\n\n rbenv install\n\nWhich will install the version of ruby that is specified in the\n.ruby-version file.\n\n#######################################################################\n\nSUGGESTION\n echo -e \"\\e[0m\"\nfi\n" + command: | + gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB + echo 409B6B1796C275462A1703113804BB82D39DC0E3:6: | gpg --import-ownertrust + echo 7D2BAF1CF37B13E2069D6956105BD0E739499BDB:6: | gpg --import-ownertrust + curl -sSL "https://get.rvm.io" | bash -s stable + echo "export RVM_HOME=$RVM_HOME" >> $BASH_ENV + echo 'export PATH=$PATH:$RVM_HOME/bin' >> $BASH_ENV + echo "source $RVM_HOME/scripts/rvm" >> $BASH_ENV name: Install/Verify Ruby Version Manager. - run: rvm autolibs enable && rvm install 3.3.5 - restore_cache: *restore-repo-cache From d5c6f7f3088958eb10f261dd2cafd67b6152c5a1 Mon Sep 17 00:00:00 2001 From: Stanley Date: Fri, 7 Mar 2025 17:07:32 +0800 Subject: [PATCH 09/37] Testing without ruby orb include --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 31abf638..01b3e3ef 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,7 +56,6 @@ aliases: orbs: azure-cli: circleci/azure-cli@1.2.0 - ruby: circleci/ruby@2.5.0 jobs: checkout_code: From 0de1a71f46c68c3e33ebee8b39523cfed7b858fa Mon Sep 17 00:00:00 2001 From: Stanley Date: Fri, 7 Mar 2025 17:13:23 +0800 Subject: [PATCH 10/37] Add missing source rvm --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01b3e3ef..3bc7ebab 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -180,9 +180,10 @@ jobs: echo 409B6B1796C275462A1703113804BB82D39DC0E3:6: | gpg --import-ownertrust echo 7D2BAF1CF37B13E2069D6956105BD0E739499BDB:6: | gpg --import-ownertrust curl -sSL "https://get.rvm.io" | bash -s stable - echo "export RVM_HOME=$RVM_HOME" >> $BASH_ENV - echo 'export PATH=$PATH:$RVM_HOME/bin' >> $BASH_ENV - echo "source $RVM_HOME/scripts/rvm" >> $BASH_ENV + echo "export RVM_HOME=/home/circleci/.rvm" >> $BASH_ENV + echo 'export PATH=$PATH:/home/circleci/.rvm/bin' >> $BASH_ENV + echo "source /home/circleci/.rvm/scripts/rvm" >> $BASH_ENV + source /home/circleci/.rvm/scripts/rvm name: Install/Verify Ruby Version Manager. - run: rvm autolibs enable && rvm install 3.3.5 - restore_cache: *restore-repo-cache From cea4321a118763e354e5954d520b7a486e043c01 Mon Sep 17 00:00:00 2001 From: Stanley Date: Fri, 7 Mar 2025 18:31:01 +0800 Subject: [PATCH 11/37] Change Android to CI node image We don't need Selenium --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3bc7ebab..3404a5f6 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -169,7 +169,7 @@ jobs: android_build_and_deploy: <<: *defaults docker: - - image: cimg/android:2025.01-browsers + - image: cimg/android:2025.01-node environment: JVM_OPTS: -Xmx3200m CIRCLE_ARTIFACTS: /home/circleci/code/cordova/platforms/android/build/outputs/apk From 6a90ebae63ed0c6dc526f29983238c57a677ee67 Mon Sep 17 00:00:00 2001 From: Stanley Date: Fri, 7 Mar 2025 18:43:39 +0800 Subject: [PATCH 12/37] Bump minor version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 853a545b..996dbe5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "goodcity", - "version": "0.26.1", + "version": "0.26.2", "description": "The GoodCity Admin app enables administrators to process donated goods.", "private": true, "directories": { From 12298716c2b463c99d73aac6eadb962d40cd2718 Mon Sep 17 00:00:00 2001 From: Stanley Date: Fri, 7 Mar 2025 18:45:36 +0800 Subject: [PATCH 13/37] Revert CI config for merge --- .circleci/config.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3404a5f6..a296e03a 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -281,40 +281,40 @@ workflows: - package_dependencies: requires: - checkout_code - # - tests: - # requires: - # - package_dependencies - # - www_build: - # requires: - # - tests - # - package_dependencies - # filters: - # branches: - # only: /^(master|live)$/ - # - www_deploy: - # requires: - # - www_build - # filters: - # branches: - # only: /^(master|live)$/ + - tests: + requires: + - package_dependencies + - www_build: + requires: + - tests + - package_dependencies + filters: + branches: + only: /^(master|live)$/ + - www_deploy: + requires: + - www_build + filters: + branches: + only: /^(master|live)$/ - ember_cordova_build: requires: - # - tests + - tests - package_dependencies filters: branches: - only: /^(master|live|update-xcode)$/ + only: /^(master|live)$/ - android_build_and_deploy: requires: - # - tests + - tests - ember_cordova_build filters: branches: - only: /^(master|live|update-xcode)$/ + only: /^(master|live)$/ - ios_build_and_deploy: requires: - # - tests + - tests - ember_cordova_build filters: branches: - only: /^(master|live|update-xcode)$/ + only: /^(master|live)$/ From 2cd314bea397b7c6d609b823a163af367e9700cf Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 22 May 2025 17:41:20 +0800 Subject: [PATCH 14/37] Revert to Ruby Orb as upstream is fixed https://github.com/CircleCI-Public/ruby-orb/issues/159 --- .circleci/config.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a296e03a..32b12961 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,6 +56,7 @@ aliases: orbs: azure-cli: circleci/azure-cli@1.2.0 + ruby: circleci/ruby@2.5.3 jobs: checkout_code: @@ -174,18 +175,8 @@ jobs: JVM_OPTS: -Xmx3200m CIRCLE_ARTIFACTS: /home/circleci/code/cordova/platforms/android/build/outputs/apk steps: - - run: - command: | - gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB - echo 409B6B1796C275462A1703113804BB82D39DC0E3:6: | gpg --import-ownertrust - echo 7D2BAF1CF37B13E2069D6956105BD0E739499BDB:6: | gpg --import-ownertrust - curl -sSL "https://get.rvm.io" | bash -s stable - echo "export RVM_HOME=/home/circleci/.rvm" >> $BASH_ENV - echo 'export PATH=$PATH:/home/circleci/.rvm/bin' >> $BASH_ENV - echo "source /home/circleci/.rvm/scripts/rvm" >> $BASH_ENV - source /home/circleci/.rvm/scripts/rvm - name: Install/Verify Ruby Version Manager. - - run: rvm autolibs enable && rvm install 3.3.5 + - ruby/install: + version: '3.3.5' - restore_cache: *restore-repo-cache - restore_cache: *restore-yarn-cache - restore_cache: *restore-bundler-cache From 7b673d9bfdf7fd45f54efea6e6538719ce8bf3b9 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 6 Aug 2025 15:00:21 +0800 Subject: [PATCH 15/37] Updates for Android API 35 --- .circleci/config.yml | 6 +-- CHANGELOG.md | 4 ++ cordova/config.xml | 1 - cordova/package-lock.json | 109 ++++++++++++++++++++------------------ cordova/package.json | 2 +- cordova/yarn.lock | 108 ++++++++++++++++++------------------- package.json | 2 +- 7 files changed, 120 insertions(+), 112 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 32b12961..930e1631 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -170,7 +170,7 @@ jobs: android_build_and_deploy: <<: *defaults docker: - - image: cimg/android:2025.01-node + - image: cimg/android:2025.04-browsers environment: JVM_OPTS: -Xmx3200m CIRCLE_ARTIFACTS: /home/circleci/code/cordova/platforms/android/build/outputs/apk @@ -294,14 +294,14 @@ workflows: - package_dependencies filters: branches: - only: /^(master|live)$/ + only: /^(master|live|android-api-35)$/ - android_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(master|live|android-api-35)$/ - ios_build_and_deploy: requires: - tests diff --git a/CHANGELOG.md b/CHANGELOG.md index 014ae2d4..74fa9429 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Admin App +## v0.26.3 + +- Updated to Android API 35 + ## v0.25.0 - Removed yarn offline mirror code for now (wasn't working well with CI builds) diff --git a/cordova/config.xml b/cordova/config.xml index 2f15f6d8..91e342a6 100755 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -24,7 +24,6 @@ - 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 996dbe5e..22655813 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "goodcity", - "version": "0.26.2", + "version": "0.26.3", "description": "The GoodCity Admin app enables administrators to process donated goods.", "private": true, "directories": { From 6e6bd5411805558ad78d3ae2a0d6f31569b292ef Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 6 Aug 2025 15:40:39 +0800 Subject: [PATCH 16/37] Check iOS builds --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 930e1631..4efb5c0e 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -308,4 +308,4 @@ workflows: - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(master|live|android-api-35)$/ From a692f47aa2045bca73642aee64576b17a02e041e Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Tue, 2 Sep 2025 14:26:45 +0800 Subject: [PATCH 17/37] Ruby 3.3.5 bundle update --- Gemfile.lock | 72 +++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6e37b414..a2b26108 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ GEM base64 nkf rexml - activesupport (7.2.2.1) + activesupport (7.2.2.2) base64 benchmark (>= 0.3) bigdecimal @@ -24,28 +24,30 @@ GEM json (>= 1.5.1) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.1) - aws-partitions (1.1061.0) - aws-sdk-core (3.220.0) + aws-eventstream (1.4.0) + aws-partitions (1.1153.0) + aws-sdk-core (3.232.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 + bigdecimal jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.99.0) - aws-sdk-core (~> 3, >= 3.216.0) + logger + aws-sdk-kms (1.112.0) + aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-s3 (1.198.0) + aws-sdk-core (~> 3, >= 3.231.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.11.0) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - base64 (0.2.0) - benchmark (0.4.0) - bigdecimal (3.1.9) - byebug (11.1.3) + base64 (0.3.0) + benchmark (0.4.1) + bigdecimal (3.2.2) + byebug (12.0.0) claide (1.1.0) cocoapods (1.16.2) addressable (~> 2.8) @@ -90,16 +92,16 @@ GEM commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.3.5) - connection_pool (2.5.0) + connection_pool (2.5.4) declarative (0.0.20) digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) - drb (2.2.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.112.0) faraday (1.10.4) @@ -118,10 +120,10 @@ 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.1.0) + faraday-multipart (1.1.1) multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) @@ -131,7 +133,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.226.0) + fastlane (2.228.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -171,12 +173,12 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.4.0) + xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-sirp (1.0.0) sysrandom (~> 1.0) - ffi (1.17.1) - ffi (1.17.1-x86_64-darwin) + 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) @@ -196,7 +198,7 @@ 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.7.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) @@ -224,43 +226,43 @@ GEM i18n (1.14.7) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.10.1) - jwt (2.10.1) + json (2.13.2) + jwt (2.10.2) base64 - logger (1.6.6) + logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.25.4) + minitest (5.25.5) molinillo (0.8.0) - multi_json (1.15.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) nkf (0.2.0) optparse (0.6.0) os (1.1.4) plist (3.7.2) public_suffix (4.0.7) - rake (13.2.1) + 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.4.1) + rexml (3.4.2) rouge (3.28.0) ruby-macho (2.5.1) ruby2_keywords (0.0.5) rubyzip (2.4.1) securerandom (0.4.1) security (0.1.5) - signet (0.19.0) + 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 @@ -288,7 +290,7 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.4.0) rexml (>= 3.3.6, < 4.0) - xcpretty (0.4.0) + xcpretty (0.4.1) rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -305,4 +307,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.5.23 + 2.5.16 From 3cbc12422599704da9469a968bed6583254ba53b Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 4 Sep 2025 11:29:45 +0800 Subject: [PATCH 18/37] Update change log --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74fa9429..943576d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ - 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) From 319b657d066b3d56a22a5d5fbb3819db5b9e3c4d Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 4 Sep 2025 16:27:57 +0800 Subject: [PATCH 19/37] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4b2ad04ef9ec08334fca513d0ef32d7442bfbb46 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 4 Sep 2025 16:33:56 +0800 Subject: [PATCH 20/37] Revert CI config for merge --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4efb5c0e..9686dc3c 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -294,18 +294,18 @@ workflows: - package_dependencies filters: branches: - only: /^(master|live|android-api-35)$/ + only: /^(master|live)$/ - android_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live|android-api-35)$/ + only: /^(master|live)$/ - ios_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live|android-api-35)$/ + only: /^(master|live)$/ From 6ae2c60575ba7a742fb5ba3b8d4824c03a5ad405 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 4 Sep 2025 16:50:47 +0800 Subject: [PATCH 21/37] Update www_deploy cimg/ruby to 3.3.8 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9686dc3c..345dbd4e 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,7 +120,7 @@ jobs: www_deploy: <<: *defaults docker: - - image: cimg/ruby:2.7.3 + - image: cimg/ruby:3.3.8 steps: - restore_cache: *restore-repo-cache - restore_cache: *restore-bundler-cache From 4fe94dba6564c1c3d91c7ffa3a33a1fc5e4f396e Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 4 Sep 2025 17:02:26 +0800 Subject: [PATCH 22/37] Removed ruby 2.7 pegging --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 345dbd4e..7c947eb8 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -134,7 +134,7 @@ jobs: - run: name: Upload to www server + azure storage command: | - sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 + # sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo "production"; else echo "staging"; fi) STAGE=$STAGE bundle exec fastlane web deploy - run: From 52726a12de192b847f4f7c37e84513b278f7cef3 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Fri, 5 Sep 2025 14:43:00 +0800 Subject: [PATCH 23/37] Revert "Removed ruby 2.7 pegging" This reverts commit 4fe94dba6564c1c3d91c7ffa3a33a1fc5e4f396e. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c947eb8..345dbd4e 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -134,7 +134,7 @@ jobs: - run: name: Upload to www server + azure storage command: | - # sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 + sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo "production"; else echo "staging"; fi) STAGE=$STAGE bundle exec fastlane web deploy - run: From b86b67f73fecd369922ac92474072f296ef36941 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Fri, 5 Sep 2025 14:48:30 +0800 Subject: [PATCH 24/37] Bump cache --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 345dbd4e..f51b1c05 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,9 +38,9 @@ aliases: paths: - bower_components - &restore-bundler-cache - key: v3-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} + key: v4-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} - &save-bundler-cache - key: v3-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} + key: v4-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} paths: - vendor/bundle - &restore-ios-bundler-cache From c637edb90d4ae68ee31f004f267a7cbbfa14aa25 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Fri, 5 Sep 2025 15:33:56 +0800 Subject: [PATCH 25/37] Bump cache --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f51b1c05..e99f625d 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,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 From 85f4621d0ffc97bad79453f13ecc0730d5691872 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 11 Sep 2025 15:20:50 +0800 Subject: [PATCH 26/37] Downgrade azure-cli --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e99f625d..197dbb68 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,6 +136,7 @@ jobs: command: | sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo "production"; else echo "staging"; fi) + pip install azure-cli==2.76.0 STAGE=$STAGE bundle exec fastlane web deploy - run: name: Upload Source Map to Rollbar From 9085c7f11cb71a6f332d7b93d5651841c490b505 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 11 Sep 2025 16:00:25 +0800 Subject: [PATCH 27/37] Use apt-get to downgrade azure cli --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 197dbb68..376f3b4c 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: command: | sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo "production"; else echo "staging"; fi) - pip install azure-cli==2.76.0 + apt-cache policy azure-cli | sudo apt-get install --allow-downgrades azure-cli==2.76.0-1~bionic STAGE=$STAGE bundle exec fastlane web deploy - run: name: Upload Source Map to Rollbar From 2e5ce4f896133e9d9122f7cb2a2b2801a34b47d7 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 11 Sep 2025 16:13:47 +0800 Subject: [PATCH 28/37] Fix typo for azure cli downgrade --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 376f3b4c..457ec4fc 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: command: | sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo "production"; else echo "staging"; fi) - apt-cache policy azure-cli | sudo apt-get install --allow-downgrades azure-cli==2.76.0-1~bionic + apt-cache policy azure-cli | sudo apt-get install --allow-downgrades azure-cli=2.76.0 STAGE=$STAGE bundle exec fastlane web deploy - run: name: Upload Source Map to Rollbar From 5d4fc9cfb9966d2a7922a54de152237ca7ed7467 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 11 Sep 2025 16:21:59 +0800 Subject: [PATCH 29/37] Downgrade azure cli to 2.76.0-1~jammy_amd64 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 457ec4fc..c1c51ea5 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: command: | sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo "production"; else echo "staging"; fi) - apt-cache policy azure-cli | sudo apt-get install --allow-downgrades azure-cli=2.76.0 + apt-cache policy azure-cli | sudo apt-get install --allow-downgrades azure-cli=2.76.0-1~jammy_amd64 STAGE=$STAGE bundle exec fastlane web deploy - run: name: Upload Source Map to Rollbar From 77c319a5d908bcf5eab9077a599a0b87ad9288ed Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 11 Sep 2025 17:14:10 +0800 Subject: [PATCH 30/37] Fix azure cli 2.76 version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1c51ea5..8b06ec4c 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: command: | sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo "production"; else echo "staging"; fi) - apt-cache policy azure-cli | sudo apt-get install --allow-downgrades azure-cli=2.76.0-1~jammy_amd64 + apt-cache policy azure-cli | sudo apt-get install --allow-downgrades azure-cli=2.76.0-1~jammy STAGE=$STAGE bundle exec fastlane web deploy - run: name: Upload Source Map to Rollbar From 600a7b9d7e6118ce95024b1d34b64213453cfdc2 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Thu, 11 Sep 2025 17:39:56 +0800 Subject: [PATCH 31/37] Add comment for reason to peg azure cli to 2.76 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b06ec4c..90c4df68 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,6 +136,7 @@ jobs: command: | sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo "production"; else echo "staging"; fi) + # Pegging to 2.76 until upstream is fixed https://github.com/Azure/azure-cli/issues/32088 apt-cache policy azure-cli | sudo apt-get install --allow-downgrades azure-cli=2.76.0-1~jammy STAGE=$STAGE bundle exec fastlane web deploy - run: From 534ba86bc323a9fc37a741f8e809e13703594d59 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 17 Sep 2025 17:25:50 +0800 Subject: [PATCH 32/37] update xcode-16.4 and ruby-3.4.3 --- .circleci/config.yml | 24 ++++++++++++------------ .ruby-version | 2 +- Gemfile.lock | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90c4df68..455b1e69 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,15 +38,15 @@ aliases: paths: - bower_components - &restore-bundler-cache - key: v4-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} + key: v5-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} - &save-bundler-cache - key: v4-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} + key: v5-admin-goodcity-bundle-{{ checksum "Gemfile.lock" }} paths: - vendor/bundle - &restore-ios-bundler-cache - key: v3-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} + key: v4-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} - &save-ios-bundler-cache - key: v3-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} + key: v4-admin-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} paths: - vendor/bundle @@ -120,7 +120,7 @@ jobs: www_deploy: <<: *defaults docker: - - image: cimg/ruby:3.3.8 + - image: cimg/ruby:3.4.3 steps: - restore_cache: *restore-repo-cache - restore_cache: *restore-bundler-cache @@ -172,13 +172,13 @@ jobs: android_build_and_deploy: <<: *defaults docker: - - image: cimg/android:2025.04-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.3.5' + version: '3.4.3' - restore_cache: *restore-repo-cache - restore_cache: *restore-yarn-cache - restore_cache: *restore-bundler-cache @@ -220,7 +220,7 @@ jobs: ios_build_and_deploy: macos: - xcode: "16.2.0" + xcode: "16.4.0" resource_class: macos.m1.medium.gen1 working_directory: ~/code shell: /bin/bash --login -eo pipefail @@ -238,7 +238,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.3.5 + - 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} @@ -289,7 +289,7 @@ workflows: - www_build filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ - ember_cordova_build: requires: - tests @@ -303,11 +303,11 @@ workflows: - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ - ios_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ diff --git a/.ruby-version b/.ruby-version index f13c6f45..753ec9c6 100755 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.3.5 +ruby-3.4.3 diff --git a/Gemfile.lock b/Gemfile.lock index a2b26108..593db54e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.4.0) - aws-partitions (1.1153.0) + aws-partitions (1.1161.0) aws-sdk-core (3.232.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -37,7 +37,7 @@ GEM aws-sdk-kms (1.112.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.198.0) + aws-sdk-s3 (1.199.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -46,7 +46,7 @@ GEM babosa (1.0.4) base64 (0.3.0) benchmark (0.4.1) - bigdecimal (3.2.2) + bigdecimal (3.2.3) byebug (12.0.0) claide (1.1.0) cocoapods (1.16.2) @@ -252,7 +252,7 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.4.2) + rexml (3.4.4) rouge (3.28.0) ruby-macho (2.5.1) ruby2_keywords (0.0.5) @@ -307,4 +307,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.5.16 + 2.7.1 From 48765156081ada6d0ca857a1cca8123172be05dc Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 17 Sep 2025 17:37:34 +0800 Subject: [PATCH 33/37] Add gem "abbrev" --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index b4f4a40a..6827d232 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source "https://rubygems.org" +gem "abbrev" gem "fastlane" gem "cocoapods" gem "colorize" diff --git a/Gemfile.lock b/Gemfile.lock index 593db54e..e83879cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,6 +5,7 @@ GEM base64 nkf rexml + abbrev (0.1.2) activesupport (7.2.2.2) base64 benchmark (>= 0.3) @@ -300,6 +301,7 @@ PLATFORMS x86_64-darwin-19 DEPENDENCIES + abbrev activesupport byebug cocoapods From 5c1c0a47f0c83eaec0fddb4b3240d840d7463350 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 17 Sep 2025 18:07:59 +0800 Subject: [PATCH 34/37] Mod CI config for test build --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 455b1e69..e865424f 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -283,7 +283,7 @@ workflows: - package_dependencies filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ - www_deploy: requires: - www_build @@ -296,7 +296,7 @@ workflows: - package_dependencies filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ - android_build_and_deploy: requires: - tests From 6776ea88e82f2355756a5f45ca99ec1b593ebddf Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 17 Sep 2025 18:22:28 +0800 Subject: [PATCH 35/37] Revert CI config for merge --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e865424f..c7389c9c 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -283,31 +283,31 @@ workflows: - package_dependencies filters: branches: - only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ + only: /^(master|live)$/ - www_deploy: requires: - www_build filters: branches: - only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ + only: /^(master|live)$/ - ember_cordova_build: requires: - tests - package_dependencies filters: branches: - only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ + only: /^(master|live)$/ - android_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ + only: /^(master|live)$/ - ios_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live|update-xcode-16.4-ruby-3.4.3)$/ + only: /^(master|live)$/ From be2d05650eaaa3cd232a4c61d6720168d8a34a73 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Tue, 14 Oct 2025 17:21:00 +0800 Subject: [PATCH 36/37] Remove pegging to test Azure CLI 2.78 --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7389c9c..e5ef350a 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,8 +136,6 @@ jobs: command: | sudo ln -s /usr/local/bin/ruby /usr/local/bin/ruby2.7 STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo "production"; else echo "staging"; fi) - # Pegging to 2.76 until upstream is fixed https://github.com/Azure/azure-cli/issues/32088 - apt-cache policy azure-cli | sudo apt-get install --allow-downgrades azure-cli=2.76.0-1~jammy STAGE=$STAGE bundle exec fastlane web deploy - run: name: Upload Source Map to Rollbar From d19812e36c686ba50406caab7703306d74b12dd0 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 11:57:27 +0800 Subject: [PATCH 37/37] An update to FCM requires a higher minimum iOS deployment target --- cordova/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cordova/config.xml b/cordova/config.xml index 91e342a6..f77afa7b 100755 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -43,7 +43,7 @@ - +