Merge pull request #2708 from brandingbrand/develop

chore(gitflow): merge develop to main
brandingbrand · May 29, 2024 · 2afe978 · 2afe978
2 parents 8467744 + 247313c
commit 2afe978
Show file tree

Hide file tree

Showing 8 changed files with 288 additions and 265 deletions.
diff --git a/apps/react-native/.coderc/plugins/plugin-local/yarn.lock b/apps/react-native/.coderc/plugins/plugin-local/yarn.lock
@@ -2357,9 +2357,9 @@ duplexer@^0.1.1, duplexer@^0.1.2:
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
 ejs@^3.1.6:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
-  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
   dependencies:
     jake "^10.8.5"
 
@@ -4027,10 +4027,10 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
@@ -4529,11 +4529,11 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
 postcss@^8.2.1:
-  version "8.4.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 

diff --git a/docs/package.json b/docs/package.json
@@ -15,7 +15,7 @@
     "@astrojs/tailwind": "^3.0.0",
     "astro": "^2.0.0",
     "lottie-web": "^5.10.2",
-    "semver": "^7.3.8",
+    "semver": "^7.5.2",
     "semver-regex": "^4.0.5",
     "tailwindcss": "^3.0.24"
   },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -42,9 +42,9 @@
     "cli-spinners": "^2.7.0",
     "cli-table": "^0.3.11",
     "deepmerge": "^4.2.2",
-    "ejs": "^3.1.8",
+    "ejs": "^3.1.10",
     "fastq": "^1.13.0",
-    "fast-xml-parser": "^4.1.0",
+    "fast-xml-parser": "^4.2.5",
     "fs-extra": "^10.1.0",
     "glob": "^8.0.3",
     "lodash": "^4.17.21",

diff --git a/packages/plugin-fastlane/CHANGELOG.md b/packages/plugin-fastlane/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @brandingbrand/code-plugin-fastlane
 
+## 2.0.3
+
+### Patch Changes
+
+- 87f5fdaa3: conditionalize android app center version capture to aggregate build number
+
 ## 2.0.2
 
 ### Patch Changes

diff --git a/packages/plugin-fastlane/assets/android/fastlane/Fastfile b/packages/plugin-fastlane/assets/android/fastlane/Fastfile
@@ -16,7 +16,9 @@ lane :increment_build do
     version = appcenter_fetch_version_number(
         owner_name: "<%= codePluginFastlane.plugin.android.appCenter.organization %>",
         app_name: "<%= codePluginFastlane.plugin.android.appCenter.appName %>",
+        <%_ if (!release) { -%>
         version: "<%- android.versioning && android.versioning.version || "1.0.0" %>"
+        <%_ } -%>
     )
 
     if version["build_number"]

diff --git a/packages/plugin-fastlane/package.json b/packages/plugin-fastlane/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@brandingbrand/code-plugin-fastlane",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "plugin for Flagship Code for fastlane app center builds",
   "license": "MIT",
   "repository": {

diff --git a/packages/plugin-fastlane/test/index.test.ts b/packages/plugin-fastlane/test/index.test.ts
@@ -132,13 +132,15 @@ describe("plugin-fastlane", () => {
           },
         },
       },
-    });
+      release: true,
+    } as any);
 
     const result = (
       await fs.readFile(path.project.resolve("android", "fastlane", "Fastfile"))
     ).toString();
 
     expect(result).not.toContain(`lane :appcenter_bundle do
   increment_build`);
+    expect(result).not.toContain("version: ");
   });
 });