From da6e3ceca236b602e7b920936932df3fe28fe45e Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 5 Aug 2025 15:13:32 +0800 Subject: [PATCH 01/16] Updated build to Android API 35 --- .circleci/config.yml | 10 +- cordova/package.json | 2 +- cordova/yarn.lock | 270 +++++++++++++++++++++---------------------- 3 files changed, 139 insertions(+), 143 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 98fc8f6a..1678cc3d 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,8 +43,8 @@ aliases: # ----------------------------- orbs: - azure-cli: circleci/azure-cli@1.2.2 - browser-tools: circleci/browser-tools@1.5.0 + azure-cli: circleci/azure-cli@1.3.2 + browser-tools: circleci/browser-tools@2.2.0 jobs: checkout_code: @@ -180,7 +180,7 @@ jobs: android_build_and_deploy: <<: *defaults docker: - - image: cimg/android:2025.01-browsers + - image: cimg/android:2025.04-browsers environment: JVM_OPTS: -Xmx3200m CIRCLE_ARTIFACTS: /home/circleci/code/cordova/platforms/android/build/outputs/apk @@ -306,14 +306,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/cordova/package.json b/cordova/package.json index ff273c8e..5278f46f 100644 --- a/cordova/package.json +++ b/cordova/package.json @@ -9,7 +9,7 @@ "devDependencies": { "@havesource/cordova-plugin-push": "github:havesource/cordova-plugin-push", "com.nrswolf.cordova.push-notifications-status": "github:nrswolf/cordova-plugin-push-notifications-status", - "cordova-android": "^13.0.0", + "cordova-android": "^14.0.1", "cordova-android-support-gradle-release": "^3.0.1", "cordova-ios": "^7.1.1", "cordova-launch-review": "^4.1.1", diff --git a/cordova/yarn.lock b/cordova/yarn.lock index 99916506..31adc571 100644 --- a/cordova/yarn.lock +++ b/cordova/yarn.lock @@ -40,7 +40,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -246,7 +246,7 @@ resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz" integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== -abbrev@^1.0.0, abbrev@1: +abbrev@1, abbrev@^1.0.0: version "1.1.1" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -256,6 +256,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.yarnpkg.com/abbrev/-/abbrev-3.0.1.tgz#8ac8b3b5024d31464fe2a5feeea9f4536bf44025" + 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" @@ -271,7 +276,7 @@ accepts@~1.3.5, accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -agent-base@^6.0.2, agent-base@6: +agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -320,10 +325,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.yarnpkg.com/android-versions/-/android-versions-2.1.0.tgz#e6cd4db647ab777e4d3332a2ff733674194a183b" + integrity sha512-oCBvVs2uaL8ohQtesGs78/X7QvFDLbKgTosBRiOIBCss1a/yiakQm/ADuoG2k/AUaI0FfrsFeMl/a+GtEtjEeA== dependencies: semver "^7.5.2" @@ -419,7 +424,7 @@ asn1@~0.2.3: dependencies: safer-buffer "~2.1.0" -assert-plus@^1.0.0, assert-plus@1.0.0: +assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= @@ -508,6 +513,13 @@ bplist-creator@0.1.0: dependencies: stream-buffers "2.2.x" +bplist-parser@0.3.1: + version "0.3.1" + resolved "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz" + integrity sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA== + dependencies: + big-integer "1.6.x" + bplist-parser@^0.0.6: version "0.0.6" resolved "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz" @@ -520,13 +532,6 @@ bplist-parser@^0.3.2: dependencies: big-integer "1.6.x" -bplist-parser@0.3.1: - version "0.3.1" - resolved "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz" - integrity sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA== - dependencies: - big-integer "1.6.x" - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" @@ -681,16 +686,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - color-name@1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + color-support@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz" @@ -800,24 +805,23 @@ cordova-android-support-gradle-release@^3.0.1: q "^1.4.1" semver "5.6.0" -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.yarnpkg.com/cordova-android/-/cordova-android-14.0.1.tgz#0d51501df5a899bcbe33b1c45165beb12782ec31" + 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" @@ -847,6 +851,24 @@ cordova-common@^5.0.0: read-chunk "^3.2.0" strip-bom "^4.0.0" +cordova-common@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/cordova-common/-/cordova-common-5.0.1.tgz#50d3d8b83eec8160f6c9e5e73efe49e94091a817" + integrity sha512-OA2NQ6wvhNz4GytPYwTdlA9xfG7Yf7ufkj4u97m3rUfoL/AECwwj0GVT2CYpk/0Fk6HyuHA3QYCxfDPYsKzI1A== + dependencies: + "@netflix/nerror" "^1.1.3" + ansi "^0.3.1" + bplist-parser "^0.3.2" + cross-spawn "^7.0.6" + elementtree "^0.1.7" + endent "^2.1.0" + fast-glob "^3.3.3" + lodash.zip "^4.2.0" + plist "^3.1.0" + q "^1.5.1" + read-chunk "^3.2.0" + strip-bom "^4.0.0" + cordova-create@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/cordova-create/-/cordova-create-5.0.0.tgz" @@ -1019,6 +1041,15 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" +cross-spawn@^7.0.6: + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + crypto-random-string@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz" @@ -1050,20 +1081,6 @@ debounce-fn@^4.0.0: dependencies: mimic-fn "^3.0.0" -debug@^4.3.3: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^4.3.4: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - debug@2.6.9: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" @@ -1071,7 +1088,7 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4: +debug@4, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1340,22 +1357,22 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" -extsprintf@^1.2.0, extsprintf@^1.4.0: - version "1.4.1" - resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz" - integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== - extsprintf@1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== +extsprintf@^1.2.0, extsprintf@^1.4.0: + version "1.4.1" + resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== + fast-deep-equal@^3.1.1: version "3.1.3" 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.12, 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== @@ -1449,7 +1466,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== @@ -1697,7 +1714,7 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -iconv-lite@^0.4.24, iconv-lite@0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -1754,7 +1771,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@^2.0.3, inherits@2, inherits@2.0.4: +inherits@2, inherits@2.0.4, inherits@^2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2051,17 +2068,7 @@ loud-rejection@^2.2.0: currently-unhandled "^0.4.1" signal-exit "^3.0.2" -lru-cache@^7.4.4: - version "7.18.3" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz" - integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== - -lru-cache@^7.5.1: - version "7.18.3" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz" - integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== - -lru-cache@^7.7.1: +lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: version "7.18.3" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== @@ -2142,7 +2149,7 @@ micromatch@^4.0.8: braces "^3.0.3" picomatch "^2.3.1" -"mime-db@>= 1.43.0 < 2", mime-db@1.52.0: +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== @@ -2188,13 +2195,6 @@ minimatch@^9.0.0, minimatch@^9.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.1: - version "9.0.3" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== - dependencies: - brace-expansion "^2.0.1" - minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz" @@ -2249,16 +2249,16 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3: - version "7.0.3" - resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz" - integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg== - minipass@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3: + version "7.0.3" + resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz" + integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg== + minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz" @@ -2272,7 +2272,7 @@ mkdirp@^1.0.3: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -ms@^2.0.0, ms@2.0.0: +ms@2.0.0, ms@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== @@ -2287,17 +2287,17 @@ ms@2.1.3: resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -mute-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz" - integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== - mute-stream@0.0.7: version "0.0.7" resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz" integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== -negotiator@^0.6.3, negotiator@0.6.3: +mute-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz" + integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== + +negotiator@0.6.3, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== @@ -2319,6 +2319,13 @@ node-gyp@^9.0.0: tar "^6.1.2" which "^2.0.2" +nopt@1.0.9: + version "1.0.9" + resolved "https://registry.npmjs.org/nopt/-/nopt-1.0.9.tgz" + integrity sha512-CmUZ3rzN0/4kRHum5pGRiGkhmBMzgtEDxrZVHqRJDSv8qK6s+wzaig/xeyB22Due5aZQeTiEZg/nrmMH2tapDQ== + dependencies: + abbrev "1" + nopt@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz" @@ -2326,19 +2333,19 @@ 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@1.0.9: - version "1.0.9" - resolved "https://registry.npmjs.org/nopt/-/nopt-1.0.9.tgz" - integrity sha512-CmUZ3rzN0/4kRHum5pGRiGkhmBMzgtEDxrZVHqRJDSv8qK6s+wzaig/xeyB22Due5aZQeTiEZg/nrmMH2tapDQ== +nopt@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-8.1.0.tgz#b11d38caf0f8643ce885818518064127f602eae3" + integrity sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A== dependencies: - abbrev "1" + abbrev "^3.0.0" normalize-package-data@^5.0.0: version "5.0.0" @@ -2651,7 +2658,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== @@ -2744,11 +2751,6 @@ q@^1.4.1, q@^1.5.1: resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= -qs@~6.5.2: - version "6.5.3" - resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz" - integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== - qs@6.11.0: version "6.11.0" resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" @@ -2756,6 +2758,11 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" +qs@~6.5.2: + version "6.5.3" + resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz" + integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== + querystringify@^2.1.1: version "2.2.0" resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz" @@ -2940,22 +2947,17 @@ rxjs@^6.4.0: dependencies: tslib "^1.9.0" -safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@5.1.2: +safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-buffer@5.2.1: +safe-buffer@5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safer-buffer@^2.0.2, safer-buffer@^2.1.0, "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -2965,20 +2967,25 @@ sax@1.1.4: resolved "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz" integrity sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk= +semver@5.6.0: + version "5.6.0" + resolved "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz" + integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== + semver@^6.0.0: version "6.3.1" 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: +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: version "7.6.3" resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== -semver@5.6.0: - version "5.6.0" - resolved "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz" - integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== +semver@^7.7.1: + version "7.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58" + integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA== send@0.18.0: version "0.18.0" @@ -3172,13 +3179,6 @@ stream-buffers@2.2.x: resolved "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz" integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg== -string_decoder@^1.1.1, string_decoder@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - string-argv@^0.3.1: version "0.3.2" resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz" @@ -3201,16 +3201,7 @@ string-argv@^0.3.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^4.1.0: - version "4.2.3" - resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.2.3: +string-width@^4.1.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3219,7 +3210,7 @@ string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^5.0.1: +string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz" integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== @@ -3228,14 +3219,12 @@ string-width@^5.0.1: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string-width@^5.1.2: - version "5.1.2" - resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz" - integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== +string_decoder@^1.1.1, string_decoder@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== dependencies: - eastasianwidth "^0.2.0" - emoji-regex "^9.2.2" - strip-ansi "^7.0.1" + safe-buffer "~5.2.0" stringify-package@^1.0.1: version "1.0.1" @@ -3459,7 +3448,7 @@ universalify@^2.0.0: resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -unpipe@~1.0.0, unpipe@1.0.0: +unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== @@ -3569,6 +3558,13 @@ which@^4.0.0: dependencies: isexe "^3.1.1" +which@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/which/-/which-5.0.0.tgz#d93f2d93f79834d4363c7d0c23e00d07c466c8d6" + 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" From 1f082734f7ab3e80c480309c6f81e6645c6b8acd Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 5 Aug 2025 15:18:40 +0800 Subject: [PATCH 02/16] Whitespace issue? --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1678cc3d..a300abcd 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,8 +74,8 @@ jobs: JOBS: 1 steps: - run: sudo apt update && sudo apt -y upgrade libu2f-udev - - browser-tools/install-chrome - - browser-tools/install-chromedriver + - browser-tools/install_chrome + - browser-tools/install_chromedriver - restore_cache: *restore-repo-cache - restore_cache: *restore-yarn-cache - restore_cache: *restore-bower-cache From c0a6a260b4a468a1cb32d18a5b0254509794f569 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 5 Aug 2025 15:47:35 +0800 Subject: [PATCH 03/16] Reverted to previous azure-cli tools --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a300abcd..89409316 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ aliases: # ----------------------------- orbs: - azure-cli: circleci/azure-cli@1.3.2 + azure-cli: circleci/azure-cli@1.2.2 browser-tools: circleci/browser-tools@2.2.0 jobs: From a3ad9374cafc3c025fecc4334b709edf1b154e3b Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 6 Aug 2025 14:07:15 +0800 Subject: [PATCH 04/16] Remove pinned Kotlin dependency --- cordova/config.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/cordova/config.xml b/cordova/config.xml index 3d3a63f0..ad38b918 100755 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -23,7 +23,6 @@ - From 6a57e8aedf96ac3ffd61ade25010a11081227141 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 6 Aug 2025 14:32:07 +0800 Subject: [PATCH 05/16] Final prep for Android API 35 --- .circleci/config.yml | 4 ++-- CHANGELOG.md | 4 ++++ package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89409316..63d122e4 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -306,14 +306,14 @@ 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fae2fa3..6475d104 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Donor App +## v0.25.2 + +- Updated to Android API 35 + ## v0.24.0 - Updated to XCode 15 / iOS SDK 17 diff --git a/package.json b/package.json index f2d2b536..333cd23b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "goodcity", - "version": "0.25.1", + "version": "0.25.2", "description": "Your quality donated items can help people in need.", "license": "MIT", "author": "", From 559182ff289af58cdae891395c6f2ac71a662ecd Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 6 Aug 2025 17:27:22 +0800 Subject: [PATCH 06/16] 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 ad38b918..b6ed09a3 100755 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -42,7 +42,7 @@ - + From 3cd4849f3ed06ad7b7b410802dc23126bb5c7115 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 11:45:38 +0800 Subject: [PATCH 07/16] Revert "Whitespace issue?" This reverts commit 1f082734f7ab3e80c480309c6f81e6645c6b8acd. --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 63d122e4..d1cde4b5 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,8 +74,8 @@ jobs: JOBS: 1 steps: - run: sudo apt update && sudo apt -y upgrade libu2f-udev - - browser-tools/install_chrome - - browser-tools/install_chromedriver + - browser-tools/install-chrome + - browser-tools/install-chromedriver - restore_cache: *restore-repo-cache - restore_cache: *restore-yarn-cache - restore_cache: *restore-bower-cache From 3acab7ff313d6ed88088664b66bae5e6ecf06dce Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 11:46:53 +0800 Subject: [PATCH 08/16] Revert "Reverted to previous azure-cli tools" This reverts commit c0a6a260b4a468a1cb32d18a5b0254509794f569. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d1cde4b5..2c22c1c0 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ aliases: # ----------------------------- orbs: - azure-cli: circleci/azure-cli@1.2.2 + azure-cli: circleci/azure-cli@1.3.2 browser-tools: circleci/browser-tools@2.2.0 jobs: From f65c453e68ef64457aac5a6a23d1394c5db87a07 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 12:14:52 +0800 Subject: [PATCH 09/16] Update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d237dd49..dd108553 100644 --- 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 @@ -121,7 +121,7 @@ cordova platform add ios@7 If you want to run the app on a debug mobile device, you can use Android Studio to run the gradle builds and push to your development phone. -- After running `cordova platform add android@13` above, open Android Studio with the project folder located at /cordova/platforms/android +- After running `cordova platform add android@14` above, open Android Studio with the project folder located at /cordova/platforms/android - Connect your mobile phone and turn on debug mode - Run the usual gradle refresh and build processes - Once the app is launched on the phone, you will have useful logs (great for Push Notification debugging) inside Android Studio and you can also open Browser Inspector to view the usual processes: `edge://inspect/#devices` From 995465df839fec9890cf37a66c6a90cb4b073ba8 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 12:52:55 +0800 Subject: [PATCH 10/16] Revert "Revert "Whitespace issue?"" This reverts commit 3cd4849f3ed06ad7b7b410802dc23126bb5c7115. --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c22c1c0..5b05b004 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,8 +74,8 @@ jobs: JOBS: 1 steps: - run: sudo apt update && sudo apt -y upgrade libu2f-udev - - browser-tools/install-chrome - - browser-tools/install-chromedriver + - browser-tools/install_chrome + - browser-tools/install_chromedriver - restore_cache: *restore-repo-cache - restore_cache: *restore-yarn-cache - restore_cache: *restore-bower-cache From f4c1024a1bd69626654cc33183d9b9a6c2cb8d77 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 14:08:54 +0800 Subject: [PATCH 11/16] Revert "Revert "Reverted to previous azure-cli tools"" This reverts commit 3acab7ff313d6ed88088664b66bae5e6ecf06dce. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b05b004..63d122e4 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ aliases: # ----------------------------- orbs: - azure-cli: circleci/azure-cli@1.3.2 + azure-cli: circleci/azure-cli@1.2.2 browser-tools: circleci/browser-tools@2.2.0 jobs: From d7a8069949a920e28b35453e6127151bbb4cc87c Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 12:58:08 +0800 Subject: [PATCH 12/16] Update xcode to 16.4 and ruby to 3.4.3 --- .circleci/config.yml | 19 +++--- .ruby-version | 2 +- Gemfile.lock | 154 ++++++++++++++++++++++++------------------- 3 files changed, 97 insertions(+), 78 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 63d122e4..a7ae6861 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,15 +26,15 @@ aliases: paths: - bower_components - &restore-bundler-cache - key: app-goodcity-bundle-{{ checksum "Gemfile.lock" }} + key: v1-app-goodcity-bundle-{{ checksum "Gemfile.lock" }} - &save-bundler-cache - key: app-goodcity-bundle-{{ checksum "Gemfile.lock" }} + key: v1-app-goodcity-bundle-{{ checksum "Gemfile.lock" }} paths: - vendor/bundle - &restore-ios-bundler-cache - key: v2-app-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} + key: v3-app-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} - &save-ios-bundler-cache - key: v2-app-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} + key: v3-app-goodcity-ios-bundle-{{ checksum "Gemfile.lock" }} paths: - vendor/bundle @@ -45,6 +45,7 @@ aliases: orbs: azure-cli: circleci/azure-cli@1.2.2 browser-tools: circleci/browser-tools@2.2.0 + ruby: circleci/ruby@2.5.4 jobs: checkout_code: @@ -130,7 +131,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 @@ -180,11 +181,13 @@ jobs: android_build_and_deploy: <<: *defaults docker: - - image: cimg/android:2025.04-browsers + - image: cimg/android:2025.10-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 @@ -226,7 +229,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 @@ -244,7 +247,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/Gemfile.lock b/Gemfile.lock index 8bc55e15..81b4b1ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,43 +1,50 @@ 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.4.0) + aws-partitions (1.1172.0) + aws-sdk-core (3.233.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.113.0) + aws-sdk-core (~> 3, >= 3.231.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.199.1) + 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) + bigdecimal (3.3.1) + 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 +58,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 +83,18 @@ 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) 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 +110,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 +139,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 +152,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 +163,11 @@ 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) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -177,12 +187,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 +208,54 @@ 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.15.1) + 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.26.0) 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) + 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 +269,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) @@ -278,4 +294,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.4.19 + 2.7.1 From fb314ed8baf1975bfb91b651a780458398cce882 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 13:00:28 +0800 Subject: [PATCH 13/16] Remove active support pinning and add gem abbrev --- Gemfile | 3 ++- Gemfile.lock | 21 +++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 698b1a9e..42a1b486 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,5 @@ gem "fastlane" gem "cocoapods" gem "colorize" gem "byebug" -gem 'activesupport', '~> 7.0.8' # pegged for ruby 3 / fastlane 2.219 +gem 'activesupport' +gem 'abbrev' diff --git a/Gemfile.lock b/Gemfile.lock index 81b4b1ad..73f9e938 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,11 +5,19 @@ GEM base64 nkf rexml - activesupport (7.0.8.7) - 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) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) @@ -38,6 +46,7 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.3.0) + benchmark (0.4.1) bigdecimal (3.3.1) byebug (12.0.0) claide (1.1.0) @@ -84,11 +93,13 @@ GEM commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.3.5) + 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.3) emoji_regex (3.2.3) escape (0.0.4) ethon (0.17.0) @@ -246,6 +257,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.21.0) addressable (~> 2.8) @@ -287,7 +299,8 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 7.0.8) + abbrev + activesupport byebug cocoapods colorize From dabaa03875334e061fe5a7f13f70621929d97932 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 13:02:52 +0800 Subject: [PATCH 14/16] Bump version and update changelog --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6475d104..7ce8090c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Donor App +## v0.25.3 + +- Update to Xcode 16.4 and Ruby 3.4.3 + ## v0.25.2 - Updated to Android API 35 diff --git a/package.json b/package.json index 333cd23b..74d3f2b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "goodcity", - "version": "0.25.2", + "version": "0.25.3", "description": "Your quality donated items can help people in need.", "license": "MIT", "author": "", From b207757a28cd2d3049ae489e3e3545ed33bb6c74 Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 13:04:36 +0800 Subject: [PATCH 15/16] Mod CI config for test build --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a7ae6861..64505c40 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -309,18 +309,18 @@ workflows: - package_dependencies filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode-ruby)$/ - android_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode-ruby)$/ - ios_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(master|live|update-xcode-ruby)$/ From a4205d057cc2711e2f25fe1e7f0bad73aa210ede Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Wed, 15 Oct 2025 14:28:35 +0800 Subject: [PATCH 16/16] Revert CI config for merge This reverts commit b207757a28cd2d3049ae489e3e3545ed33bb6c74. --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64505c40..a7ae6861 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -309,18 +309,18 @@ workflows: - package_dependencies filters: branches: - only: /^(master|live|update-xcode-ruby)$/ + only: /^(master|live)$/ - android_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live|update-xcode-ruby)$/ + only: /^(master|live)$/ - ios_build_and_deploy: requires: - tests - ember_cordova_build filters: branches: - only: /^(master|live|update-xcode-ruby)$/ + only: /^(master|live)$/