Merge pull request #1223 from rgoldberg/6.0.2

6.0.2 omnibus

Author: rgoldberg

.editorconfig

@@ -20,13 +20,15 @@ spelling_language = en_US
 tab_width = 2
 trim_trailing_whitespace = true
 
+[*.{h,json,swiftformat}]
+max_line_length = off
+
 [*.md]
-# Trailing spaces have meaning in Markdown
+indent_size = 1
+indent_style = space
 max_line_length = 80
 trim_trailing_whitespace = false
 
-[{*.yaml,*.yml}]
-max_line_length = 80
-
-[Scripts/*]
-max_line_length = 80
+[*.{yaml,yml}]
+indent_size = 2
+indent_style = space

.geminiignore

@@ -0,0 +1,7 @@
+*.gif
+*.ico
+*.jpeg
+*.jpg
+*.png
+*.webp
+Package.resolved

.github/actionlint.yaml

@@ -19,9 +19,11 @@ jobs:
       matrix:
         include:
         - runner: macos-14
-          xcode: brew
+          xcode: swift
         - runner: macos-15
+          xcode: 26.3
         - runner: macos-15-intel
+          xcode: 26.3
         - runner: macos-26
         - runner: macos-26-intel
     runs-on: ${{matrix.runner}}
@@ -44,14 +46,14 @@ jobs:
       run: Scripts/setup_workflow_repo
 
     - name: 🛠 Select Xcode version
-      if: matrix.xcode != 'brew'
+      if: matrix.xcode != 'swift'
       run: xcodes select ${{matrix.xcode}}
 
     - name: 👢 Bootstrap
       run: Scripts/bootstrap
 
     - name: 🕊 Use Homebrew Core Swift
-      if: matrix.xcode == 'brew'
+      if: matrix.xcode == 'swift'
       run: |
         brew install swift
         printf $'%s\n' "$(brew --prefix swift)/bin" >> "${GITHUB_PATH}"
@@ -60,9 +62,8 @@ jobs:
       run: Scripts/build build-test -c release
 
     - name: 🧪 Test
-      if: matrix.xcode != 'brew'
+      if: matrix.runner != 'macos-14'
       run: Scripts/test
 
     - name: 🚨 Lint
-      if: matrix.xcode != 'brew'
       run: Scripts/lint

.github/workflows/build-test.yaml

@@ -33,9 +33,10 @@ jobs:
     - name: 🖋 Delete tag lacking valid signature
       run: |
         git fetch --force origin "${GITHUB_REF}:${GITHUB_REF}"
+        # editorconfig-checker-disable
         if [[\
-         "$(git cat-file tag "${GITHUB_REF_NAME}")" != *'-----BEGIN SSH SIGNATURE-----'*'-----END SSH SIGNATURE-----'\
-         ]]; then
+         "$(git cat-file tag "${GITHUB_REF_NAME}")" != *'-----BEGIN SSH SIGNATURE-----'*'-----END SSH SIGNATURE-----' \
+        ]]; then # editorconfig-checker-enable
           printf $'Error: Deleting tag %s because it does not have a valid signature\n' "${GITHUB_REF_NAME}" >&2
           git push -d origin "${GITHUB_REF_NAME}"
           exit 1
@@ -55,7 +56,7 @@ jobs:
         git fetch --force origin "${DEFAULT_BRANCH_NAME}:${DEFAULT_BRANCH_NAME}"
         if ! git merge-base --is-ancestor "${GITHUB_REF_NAME}" "${DEFAULT_BRANCH_NAME}"; then
           printf $'Error: Deleting version tag %s because it is not on the %s branch\n' "${GITHUB_REF_NAME}"\
-           "${DEFAULT_BRANCH_NAME}" >&2
+           "${DEFAULT_BRANCH_NAME}" >&2 # editorconfig-checker-disable-line
           git push -d origin "${GITHUB_REF_NAME}"
           exit 3
         fi
@@ -79,6 +80,7 @@ jobs:
         brew tap "${GITHUB_REPOSITORY_OWNER}/tap"
 
         unsetopt errexit
+        # editorconfig-checker-disable
         bump_output="$(brew bump-formula-pr\
          --tag "${GITHUB_REF_NAME}"\
          --revision "${GITHUB_SHA}"\
@@ -89,7 +91,7 @@ jobs:
          --verbose\
          "${GITHUB_REPOSITORY_OWNER}/tap/mas"\
          2>&1)"
-        exit_status="${?}"
+        exit_status="${?}" # editorconfig-checker-enable
         setopt errexit
 
         printf %s "${bump_output}"
@@ -101,6 +103,7 @@ jobs:
       env:
         GH_TOKEN: ${{github.token}}
       run: |
+        # editorconfig-checker-disable
         gh release create\
          "${GITHUB_REF_NAME}"\
          ".build/mas-${GITHUB_REF_NAME#v}-arm64.pkg"\
@@ -110,3 +113,4 @@ jobs:
          ${"${GITHUB_REF_NAME//[^-]}":+-p}\
          -t "${GITHUB_REF_NAME}: ${$(git tag -l "${GITHUB_REF_NAME}" --format='%(contents)')%%$'\n'*}"\
          --generate-notes
+        # editorconfig-checker-enable

.github/workflows/tag-pushed.yaml

@@ -1,5 +1,7 @@
+# editorconfig-checker-disable
 # yamllint disable-line rule:line-length
 # yaml-language-server: $schema=https://raw.githubusercontent.com/DavidAnson/markdownlint-cli2/main/schema/markdownlint-cli2-config-schema.json
+# editorconfig-checker-enable
 #
 # .markdownlint-cli2.yaml
 # mas
@@ -20,7 +22,7 @@ config:
   emphasis-style:
     style: underscore
   fenced-code-language:
-    allowed_languages: [console, shell]
+    allowed_languages: [console, shell, swift]
     language_only: true
   heading-style:
     style: atx
@@ -35,7 +37,7 @@ config:
     code_blocks: false
     spaces_per_tab: 2
   no-inline-html:
-    allowed_elements: [details, h1, summary]
+    allowed_elements: [a, details, h1, summary]
   no-trailing-spaces:
     code_blocks: true
     strict: true

.markdownlint-cli2.yaml

@@ -2,12 +2,11 @@
 # .periphery.yaml
 # mas
 #
-# Periphery 3.6.0
+# Periphery 3.7.2
 #
 ---
 color: always
 disable_update_check: true
 quiet: true
 relative_results: true
 strict: true
-superfluous_ignore_comments: false

.periphery.yaml

@@ -2,7 +2,7 @@
 # .swiftformat
 # mas
 #
-# SwiftFormat 0.60.1
+# SwiftFormat 0.61.0
 #
 
 # Disabled rules (enabled by default)
@@ -25,6 +25,7 @@
 --enable noGuardInTests
 --enable organizeDeclarations
 --enable preferFinalClasses
+--enable preferSwiftStringAPI
 --enable preferSwiftTesting
 --enable privateStateVariables
 --enable propertyTypes
@@ -33,6 +34,7 @@
 --enable unusedPrivateDeclarations
 --enable urlMacro
 --enable validateTestCases
+--enable wrapCaseBodies
 --enable wrapConditionalBodies
 --enable wrapEnumCases
 --enable wrapMultilineFunctionChains
@@ -67,6 +69,7 @@
 --short-optionals always
 --single-line-for-each convert
 --stored-var-attributes prev-line
+--suite-name-format standard-identifiers
 --tab-width 2
 --timezone utc
 --type-attributes prev-line

.swiftformat

@@ -1 +1 @@
-26.3
+26.4