Skip to content

Merge QA into Master #509

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
merged 3 commits into from
Oct 16, 2024
Merged

Merge QA into Master #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
507f51c
chore(ci): update CircleCI config for Mac M1 and Xcode 14.2 (#496)
mabdullahabid Oct 3, 2024
f963abe
chore(circleci): remove _JAVA_OPTIONS from Android config to simplify…
mabdullahabid Oct 3, 2024
ab3dcd9
Merge pull request #504 from crowdbotics/develop
crowdbotics-apps Oct 9, 2024
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

Based on [Common Changelog](https://common-changelog.org/).

## 2.7.4 - 2024-10-02

### Changed

Updated CircleCI build pipeline to use updated Xcode and resource_class for Mac M1

## 2.6.3 - 2024-01-18

### Fixed
Expand Down
2 changes: 0 additions & 2 deletions dist/cookie/{{cookiecutter.project_slug}}/.circleci/generate_mobile_android_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ jobs:
environment:
- TERM: "dumb"
- ADB_INSTALL_TIMEOUT: 10
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport"
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
- BUILD_THREADS: 2
steps:
Expand Down Expand Up @@ -124,7 +123,6 @@ jobs:
environment:
- TERM: "dumb"
- ADB_INSTALL_TIMEOUT: 10
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport"
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
- BUILD_THREADS: 2
steps:
Expand Down
8 changes: 4 additions & 4 deletions dist/cookie/{{cookiecutter.project_slug}}/.circleci/generate_mobile_ios_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:

appetize:
macos:
xcode: "14.1.0"
resource_class: macos.x86.medium.gen2
xcode: "14.2.0"
resource_class: macos.m1.medium.gen1
working_directory: ~/build

# use a --login shell so our "set Ruby version" command gets picked up for later steps
Expand Down Expand Up @@ -147,8 +147,8 @@ jobs:

ios:
macos:
xcode: "14.1.0"
resource_class: macos.x86.medium.gen2
xcode: "14.2.0"
resource_class: macos.m1.medium.gen1
working_directory: ~/build

# use a --login shell so our "set Ruby version" command gets picked up for later steps
Expand Down
2 changes: 1 addition & 1 deletion dist/cookie/{{cookiecutter.project_slug}}/.crowdbotics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"scaffold": {
"type": "react-native",
"version": "2.7.3",
"version": "2.7.4",
"cookiecutter_context": {
"project_name": "{{cookiecutter.project_name}}",
"project_slug": "{{cookiecutter.project_slug}}",
Expand Down
419 changes: 222 additions & 197 deletions dist/cookie/{{cookiecutter.project_slug}}/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scaffold/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "template",
"description": "React Native Template",
"version": "2.7.3",
"version": "2.7.4",
"author": "Crowdbotics"
}
2 changes: 0 additions & 2 deletions scaffold/template/custom/.circleci/generate_mobile_android_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ jobs:
environment:
- TERM: "dumb"
- ADB_INSTALL_TIMEOUT: 10
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport"
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
- BUILD_THREADS: 2
steps:
Expand Down Expand Up @@ -124,7 +123,6 @@ jobs:
environment:
- TERM: "dumb"
- ADB_INSTALL_TIMEOUT: 10
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport"
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
- BUILD_THREADS: 2
steps:
Expand Down
8 changes: 4 additions & 4 deletions scaffold/template/custom/.circleci/generate_mobile_ios_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:

appetize:
macos:
xcode: "14.1.0"
resource_class: macos.x86.medium.gen2
xcode: "14.2.0"
resource_class: macos.m1.medium.gen1
working_directory: ~/build

# use a --login shell so our "set Ruby version" command gets picked up for later steps
Expand Down Expand Up @@ -147,8 +147,8 @@ jobs:

ios:
macos:
xcode: "14.1.0"
resource_class: macos.x86.medium.gen2
xcode: "14.2.0"
resource_class: macos.m1.medium.gen1
working_directory: ~/build

# use a --login shell so our "set Ruby version" command gets picked up for later steps
Expand Down
2 changes: 1 addition & 1 deletion scaffold/template/custom/.crowdbotics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"scaffold": {
"type": "react-native",
"version": "2.7.3",
"version": "2.7.4",
"cookiecutter_context": {
"project_name": "{{cookiecutter.project_name}}",
"project_slug": "{{cookiecutter.project_slug}}",
Expand Down
Loading