diff --git a/.changeset/config.json b/.changeset/config.json index 3430f1051f..b93bd11e6f 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -5,7 +5,7 @@ "fixed": [], "linked": [], "access": "restricted", - "baseBranch": "v13", + "baseBranch": "develop", "updateInternalDependencies": "patch", "ignore": ["@brandingbrand/code-docs", "@brandingbrand/code-example"], "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": { diff --git a/apps/example/package.json b/apps/example/package.json index 2c8e4d051b..cfda8f539f 100644 --- a/apps/example/package.json +++ b/apps/example/package.json @@ -34,8 +34,8 @@ "@babel/core": "^7.20.0", "@babel/preset-env": "^7.20.0", "@babel/runtime": "^7.20.0", - "@brandingbrand/code-cli": "13.1.1", - "@brandingbrand/code-cli-kit": "13.1.0", + "@brandingbrand/code-cli": "13.1.2", + "@brandingbrand/code-cli-kit": "13.1.1", "@brandingbrand/code-jest-config": "*", "@brandingbrand/code-plugin-app-icon": "2.0.1", "@brandingbrand/code-plugin-asset": "2.0.1", diff --git a/packages/cli-kit/CHANGELOG.md b/packages/cli-kit/CHANGELOG.md index 0d8403e035..dac0e5778a 100644 --- a/packages/cli-kit/CHANGELOG.md +++ b/packages/cli-kit/CHANGELOG.md @@ -1,5 +1,11 @@ # @brandingbrand/code-cli-kit +## 13.1.1 + +### Patch Changes + +- 05eeaa6: add exit code to failed actions + ## 13.1.0 ### Minor Changes diff --git a/packages/cli-kit/package.json b/packages/cli-kit/package.json index 08a46a7cef..8e100157a9 100644 --- a/packages/cli-kit/package.json +++ b/packages/cli-kit/package.json @@ -1,6 +1,6 @@ { "name": "@brandingbrand/code-cli-kit", - "version": "13.1.0", + "version": "13.1.1", "description": "tools for Flagship Code react-native application", "license": "MIT", "main": "dist/index.js", diff --git a/packages/cli-kit/src/lib/FlagshipCodeManager.ts b/packages/cli-kit/src/lib/FlagshipCodeManager.ts index 9f77ade9fb..bc66ce447e 100644 --- a/packages/cli-kit/src/lib/FlagshipCodeManager.ts +++ b/packages/cli-kit/src/lib/FlagshipCodeManager.ts @@ -94,6 +94,7 @@ export class FlagshipCodeManager extends EventEmitter { } catch (e: any) { FlagshipCodeLogger.shared.error(e); this.emit('onError'); + process.exit(1); } ++actionsRun; diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 65f589d35a..a74f4507ce 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,5 +1,11 @@ # @brandingbrand/code-cli +## 13.1.2 + +### Patch Changes + +- pin concurrent-ruby version in Gemfile + ## 13.1.1 ### Patch Changes diff --git a/packages/cli/package.json b/packages/cli/package.json index 9f12549ead..0164009f89 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@brandingbrand/code-cli", - "version": "13.1.1", + "version": "13.1.2", "description": "cli for Flagship Code applications", "license": "MIT", "bin": { diff --git a/packages/cli/templates/react-native-0.72/addons/ios/Gemfile b/packages/cli/templates/react-native-0.72/addons/ios/Gemfile index 09335eef29..0f0e372554 100644 --- a/packages/cli/templates/react-native-0.72/addons/ios/Gemfile +++ b/packages/cli/templates/react-native-0.72/addons/ios/Gemfile @@ -4,3 +4,4 @@ source "https://rubygems.org" gem 'cocoapods', '~> 1.15.0' gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' gem 'xcodeproj', '~> 1.25.0' +gem 'concurrent-ruby', '< 1.3.4' diff --git a/packages/cli/templates/react-native-0.73/addons/ios/Gemfile b/packages/cli/templates/react-native-0.73/addons/ios/Gemfile index 09335eef29..0f0e372554 100644 --- a/packages/cli/templates/react-native-0.73/addons/ios/Gemfile +++ b/packages/cli/templates/react-native-0.73/addons/ios/Gemfile @@ -4,3 +4,4 @@ source "https://rubygems.org" gem 'cocoapods', '~> 1.15.0' gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' gem 'xcodeproj', '~> 1.25.0' +gem 'concurrent-ruby', '< 1.3.4'