Skip to content

Commit a8db1a3

Browse files
authored
Merge branch 'main' into feat/6450-fail-on-unfixable
2 parents 160c969 + e53760e commit a8db1a3

23 files changed

Lines changed: 458 additions & 227 deletions

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Get Swift version
2323
id: swift_version
2424
run: echo "version=$(swift --version | grep '[5-9]\.[0-9]\+\(\.[0-9]\)\?' -o | head -1)" >> "$GITHUB_OUTPUT"
25-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
25+
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
2626
with:
2727
key: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}-${{ hashFiles('Package.resolved', 'Package.swift') }}
2828
restore-keys: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}-

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616
with:
1717
persist-credentials: false
18-
- uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1.292.0
18+
- uses: ruby/setup-ruby@4dc28cf14d77b0afa6832d9765ac422dbf0dfedd # v1.298.0
1919
with:
2020
bundler-cache: true
2121
- name: Build SwiftLint and SourceKitten
@@ -27,7 +27,7 @@ jobs:
2727
- name: Get Swift version
2828
id: swift_version
2929
run: echo "version=$(swift --version | grep '[5-9]\.[0-9]\+\(\.[0-9]\)\?' -o | head -1)" >> "$GITHUB_OUTPUT"
30-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
30+
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
3131
with:
3232
key: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}-${{ hashFiles('Package.resolved', 'Package.swift') }}
3333
restore-keys: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}-

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- *checkout-step
3030
- name: Lint
31-
uses: DavidAnson/markdownlint-cli2-action@07035fd053f7be764496c0f8d8f9f41f98305101 # v22.0.0
31+
uses: DavidAnson/markdownlint-cli2-action@ce4853d43830c74c1753b39f3cf40f71c2031eb9 # v23.0.0
3232
with:
3333
globs: |
3434
CHANGELOG.md

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
ref: ${{ github.ref_name }}
7777
persist-credentials: false
7878
- name: Set up Ruby and Bundler
79-
uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1.292.0
79+
uses: ruby/setup-ruby@4dc28cf14d77b0afa6832d9765ac422dbf0dfedd # v1.298.0
8080
with:
8181
bundler-cache: true
8282
- name: Lint Podspec # Make sure Podspec still builds okay on CI with old release.
@@ -258,7 +258,7 @@ jobs:
258258
run: |
259259
Compress-Archive -Path "artifacts/swiftlint.exe" -DestinationPath "artifacts/SwiftLint.${{ matrix.arch }}.zip" -Force
260260
- name: Setup MSBuild
261-
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2
261+
uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
262262
- name: Build WiX MSI
263263
shell: pwsh
264264
run: |

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Get Swift version
2525
id: swift_version
2626
run: echo "version=$(swift --version | grep '[5-9]\.[0-9]\+\(\.[0-9]\)\?' -o | head -1)" >> "$GITHUB_OUTPUT"
27-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
27+
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
2828
with:
2929
key: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}-${{ hashFiles('Package.resolved', 'Package.swift') }}
3030
restore-keys: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}-
@@ -51,7 +51,7 @@ jobs:
5151
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
5252
steps:
5353
- *checkout-step
54-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
54+
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
5555
with:
5656
key: macos-${{ matrix.macOS }}-xcode-spm-${{ matrix.xcode }}-${{ hashFiles('Package.resolved', 'Package.swift') }}
5757
restore-keys: macos-${{ matrix.macOS }}-xcode-spm-${{ matrix.xcode }}-
@@ -84,7 +84,7 @@ jobs:
8484
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8585
with:
8686
persist-credentials: false
87-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
87+
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
8888
with:
8989
key: windows-${{ matrix.windows-version }}-spm-${{ env.SWIFT_VERSION }}-${{ env.SWIFT_BUILD }}-${{ hashFiles('Package.resolved', 'Package.swift') }}
9090
restore-keys: windows-${{ matrix.windows-version }}-spm-${{ env.SWIFT_VERSION }}-${{ env.SWIFT_BUILD }}-

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
[theamodhshetty](https://github.com/theamodhshetty)
4545
[#5741](https://github.com/realm/SwiftLint/issues/5741)
4646

47+
* Add detection of cases such as `String.init(decoding: data, as: UTF8.self)` and
48+
`let text: String = .init(decoding: data, as: UTF8.self)` to
49+
`optional_data_string_conversion` rule.
50+
[nadeemnali](https://github.com/nadeemnali)
51+
[#6359](https://github.com/realm/SwiftLint/issues/6359)
52+
4753
### Bug Fixes
4854

4955
* Add an `ignore_attributes` option to `implicit_optional_initialization` so
@@ -72,6 +78,16 @@
7278
[SimplyDanny](https://github.com/SimplyDanny)
7379
[#6466](https://github.com/realm/SwiftLint/issues/6466)
7480

81+
* Track identifiers declared in tuples to avoid false positives in the
82+
`redundant_self` rule.
83+
[SimplyDanny](https://github.com/SimplyDanny)
84+
[#6553](https://github.com/realm/SwiftLint/issues/6553)
85+
86+
* Respect existing environment variables when setting `BUILD_WORKSPACE_DIRECTORY`
87+
in build tool plugins.
88+
[SimplyDanny](https://github.com/SimplyDanny)
89+
[#6080](https://github.com/realm/SwiftLint/issues/6080)
90+
7591
## 0.63.2: High-Speed Extraction
7692

7793
### Breaking

Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.2.2.1)
8+
activesupport (7.2.3.1)
99
base64
1010
benchmark (>= 0.3)
1111
bigdecimal
@@ -14,7 +14,7 @@ GEM
1414
drb
1515
i18n (>= 1.6, < 2)
1616
logger (>= 1.4.2)
17-
minitest (>= 5.1)
17+
minitest (>= 5.1, < 6)
1818
securerandom (>= 0.3)
1919
tzinfo (~> 2.0, >= 2.0.5)
2020
addressable (2.8.7)
@@ -24,8 +24,8 @@ GEM
2424
json (>= 1.5.1)
2525
atomos (0.1.3)
2626
base64 (0.3.0)
27-
benchmark (0.4.1)
28-
bigdecimal (3.2.2)
27+
benchmark (0.5.0)
28+
bigdecimal (4.0.1)
2929
claide (1.1.0)
3030
claide-plugins (0.9.2)
3131
cork
@@ -69,8 +69,8 @@ GEM
6969
netrc (~> 0.11)
7070
cocoapods-try (1.2.0)
7171
colored2 (3.1.2)
72-
concurrent-ruby (1.3.5)
73-
connection_pool (2.5.3)
72+
concurrent-ruby (1.3.6)
73+
connection_pool (3.0.2)
7474
cork (0.3.0)
7575
colored2 (~> 3.1)
7676
danger (9.5.3)
@@ -111,7 +111,7 @@ GEM
111111
rchardet (~> 1.8)
112112
httpclient (2.9.0)
113113
mutex_m
114-
i18n (1.14.7)
114+
i18n (1.14.8)
115115
concurrent-ruby (~> 1.0)
116116
jazzy (0.15.4)
117117
activesupport (>= 5.0, < 8)
@@ -125,15 +125,15 @@ GEM
125125
sassc (~> 2.1)
126126
sqlite3 (~> 1.3)
127127
xcinvoke (~> 0.3.0)
128-
json (2.18.1)
128+
json (2.19.2)
129129
kramdown (2.5.1)
130130
rexml (>= 3.3.9)
131131
kramdown-parser-gfm (1.1.0)
132132
kramdown (~> 2.0)
133133
liferaft (0.0.6)
134134
logger (1.7.0)
135135
mini_portile2 (2.8.9)
136-
minitest (5.25.5)
136+
minitest (5.27.0)
137137
molinillo (0.8.0)
138138
mustache (1.1.1)
139139
mutex_m (0.3.0)

MODULE.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ module(
55
repo_name = "SwiftLint",
66
)
77

8-
bazel_dep(name = "apple_support", version = "2.3.0", repo_name = "build_bazel_apple_support")
8+
bazel_dep(name = "apple_support", version = "2.4.0", repo_name = "build_bazel_apple_support")
99
bazel_dep(name = "bazel_skylib", version = "1.9.0")
1010
bazel_dep(name = "platforms", version = "1.0.0")
11-
bazel_dep(name = "rules_apple", version = "4.5.0", repo_name = "build_bazel_rules_apple")
11+
bazel_dep(name = "rules_apple", version = "4.5.2", repo_name = "build_bazel_rules_apple")
1212
bazel_dep(name = "rules_cc", version = "0.2.17")
13-
bazel_dep(name = "rules_shell", version = "0.6.1", repo_name = "build_bazel_rules_shell")
13+
bazel_dep(name = "rules_shell", version = "0.7.1", repo_name = "build_bazel_rules_shell")
1414
bazel_dep(name = "rules_swift", version = "3.5.0", max_compatibility_level = 3, repo_name = "build_bazel_rules_swift")
1515

1616
bazel_dep(name = "sourcekitten", version = "0.37.2", repo_name = "SourceKittenFramework")
@@ -35,4 +35,4 @@ use_repo(apple_cc_configure, "local_config_apple_cc")
3535

3636
# Dev Dependencies
3737

38-
bazel_dep(name = "rules_xcodeproj", version = "3.6.0", dev_dependency = True)
38+
bazel_dep(name = "rules_xcodeproj", version = "4.0.0", dev_dependency = True)

Package.resolved

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ let package = Package(
3636
],
3737
dependencies: [
3838
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "1.6.1")),
39-
.package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "604.0.0-prerelease-2026-01-20"),
39+
.package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "604.0.0-prerelease-2026-03-31"),
4040
.package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMajor(from: "0.37.2")),
4141
.package(url: "https://github.com/jpsim/Yams.git", .upToNextMajor(from: "6.0.2")),
4242
.package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", .upToNextMajor(from: "0.9.0")),

0 commit comments

Comments
 (0)