Merge pull request #504 from crowdbotics/develop

crowdbotics · Oct 9, 2024 · ab3dcd9 · ab3dcd9
2 parents fd12846 + f963abe
commit ab3dcd9
Show file tree

Hide file tree

Showing 9 changed files with 239 additions and 212 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/dist/cookie/{{cookiecutter.project_slug}}/.circleci/generate_mobile_android_config.sh b/dist/cookie/{{cookiecutter.project_slug}}/.circleci/generate_mobile_android_config.sh
@@ -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:
@@ -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:

diff --git a/dist/cookie/{{cookiecutter.project_slug}}/.circleci/generate_mobile_ios_config.sh b/dist/cookie/{{cookiecutter.project_slug}}/.circleci/generate_mobile_ios_config.sh
@@ -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
@@ -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

diff --git a/dist/cookie/{{cookiecutter.project_slug}}/.crowdbotics.json b/dist/cookie/{{cookiecutter.project_slug}}/.crowdbotics.json
@@ -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}}",

diff --git a/dist/cookie/{{cookiecutter.project_slug}}/yarn.lock b/dist/cookie/{{cookiecutter.project_slug}}/yarn.lock
diff --git a/scaffold/package.json b/scaffold/package.json
@@ -1,6 +1,6 @@
 {
   "name": "template",
   "description": "React Native Template",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "author": "Crowdbotics"
 }
diff --git a/scaffold/template/custom/.circleci/generate_mobile_android_config.sh b/scaffold/template/custom/.circleci/generate_mobile_android_config.sh
@@ -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:
@@ -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:

diff --git a/scaffold/template/custom/.circleci/generate_mobile_ios_config.sh b/scaffold/template/custom/.circleci/generate_mobile_ios_config.sh
@@ -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
@@ -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

diff --git a/scaffold/template/custom/.crowdbotics.json b/scaffold/template/custom/.crowdbotics.json
@@ -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}}",