Skip to content
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.

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

Merge develop into qa #1188

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Merge develop into qa #1188

merged 1 commit into from
Oct 9, 2024

Conversation

crowdbotics-apps
Copy link
Contributor

This PR merges changes from develop into qa.

* fix(Pipfile): pin cookiecutter and urllib3 versions to ensure consistent environment across different setups
fix(Pipfile.lock): upgrade certifi package to 2024.07.04
fix(yarn.lock): upgrade ip package to 1.1.9

* fix(Gemfile): update cocoapods version to avoid known issues in 1.15.0 and 1.15.1
feat(Gemfile): add activesupport gem with version constraints for better compatibility and stability

* ci(config.yml): update Xcode version and resource class for iOS job (#1179)

Update the Xcode version from 14.1.0 to 14.2.0 to ensure compatibility
with the latest iOS features and improvements. Change the resource
class from macos.x86.medium.gen2 to macos.m1.medium.gen1 to leverage
the performance benefits of Apple's M1 architecture, which can lead
to faster build times and more efficient resource usage.

* chore(ci): remove deprecated _JAVA_OPTIONS from CircleCI config (#1180)

Remove the _JAVA_OPTIONS environment variable as it is no longer needed. The options it provided are now default in newer Java versions, making this configuration redundant. This change simplifies the CircleCI configuration and reduces potential confusion or conflicts with Java settings.

* Upgrade fast-xml-parser, dset, babel, ws, and brace to incorporate latest bug fixes and improvements (#1178)

* chore(package.json): upgrade fast-xml-parser, dset, babel, ws, braces, and sqlparse  to incorporate latest bug fixes and improvements

* chore: update dependencies in yarn.lock

- Update braces from 3.0.2 to 3.0.3
- Update component-emitter from 1.3.0 to 1.3.1
- Update fill-range from 7.0.1 to 7.1.1
- Update function-bind from 1.1.1 to 1.1.2
- Add hasown 2.0.2
- Update is-accessor-descriptor from 1.0.0 to 1.0.1
- Remove unused fast-xml-parser 4.2.5

These updates are done to keep the project dependencies up-to-date and potentially benefit from bug fixes, new features, and performance improvements in the updated packages.

chore(yarn.lock): update dependencies to latest versions for improved security and performance

---------

Co-authored-by: Shashank Sinha <[email protected]>
Co-authored-by: Dan DeFelippi <[email protected]>
Co-authored-by: Crowdbotics <[email protected]>
Co-authored-by: Cody Redmond <[email protected]>
Co-authored-by: Abdullah Abid <[email protected]>
@crowdbotics-apps crowdbotics-apps merged commit af868ce into qa Oct 9, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants