Skip to content

Update to Cordova Android 14, iOS target to 13, XCode 16.4 and Ruby to 3.4.3 #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stanleylhs merged 16 commits into from
Oct 16, 2025
Merged

Update to Cordova Android 14, iOS target to 13, XCode 16.4 and Ruby to 3.4.3 #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
da6e3ce
Updated build to Android API 35
steveyken Aug 5, 2025
1f08273
Whitespace issue?
steveyken Aug 5, 2025
c0a6a26
Reverted to previous azure-cli tools
steveyken Aug 5, 2025
a3ad937
Remove pinned Kotlin dependency
steveyken Aug 6, 2025
6a57e8a
Final prep for Android API 35
steveyken Aug 6, 2025
559182f
An update to FCM requires a higher minimum iOS deployment target
steveyken Aug 6, 2025
3cd4849
Revert "Whitespace issue?"
stanleylhs Oct 15, 2025
3acab7f
Revert "Reverted to previous azure-cli tools"
stanleylhs Oct 15, 2025
f65c453
Update readme
stanleylhs Oct 15, 2025
995465d
Revert "Revert "Whitespace issue?""
stanleylhs Oct 15, 2025
f4c1024
Revert "Revert "Reverted to previous azure-cli tools""
stanleylhs Oct 15, 2025
d7a8069
Update xcode to 16.4 and ruby to 3.4.3
stanleylhs Oct 15, 2025
fb314ed
Remove active support pinning and add gem abbrev
stanleylhs Oct 15, 2025
dabaa03
Bump version and update changelog
stanleylhs Oct 15, 2025
b207757
Mod CI config for test build
stanleylhs Oct 15, 2025
a4205d0
Revert CI config for merge
stanleylhs Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -44,7 +44,8 @@ aliases:

orbs:
azure-cli: circleci/[email protected]
browser-tools: circleci/[email protected]
browser-tools: circleci/[email protected]
ruby: circleci/[email protected]

jobs:
checkout_code:
Expand Down Expand Up @@ -74,8 +75,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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -180,11 +181,13 @@ jobs:
android_build_and_deploy:
<<: *defaults
docker:
- image: cimg/android:2025.01-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
Expand Down Expand Up @@ -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
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.0.6
ruby-3.4.3
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Donor App

## v0.25.3

- Update to Xcode 16.4 and Ruby 3.4.3

## v0.25.2

- Updated to Android API 35

## v0.24.0

- Updated to XCode 15 / iOS SDK 17
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Loading