Skip to content

build(editor): drop swift-custom-dump so the editor package's lockfile is toolchain-independent - #2889

Merged
datlechin merged 4 commits into
mainfrom
fix/editor-package-lockfile
Sep 15, 2026
Merged

datlechin merged 4 commits into
mainfrom
fix/editor-package-lockfile

Conversation

@datlechin

@datlechin datlechin commented Sep 15, 2026

Copy link
Copy Markdown
Member

Stacked on #2887, which fixes the step ahead of this one. Merging #2887 retargets this to main.

Third thing keeping main's Package Tests red, behind #2887 and #2888. Once the grammars step
passes, the next one fails:

Run CodeEditSourceEditor package tests
  error: an out-of-date resolved file was detected at LocalPackages/CodeEditSourceEditor/Package.resolved,
  which is not allowed when automatic dependency resolution is disabled; please make sure to update the
  file to reflect the changes in dependencies. Running resolver because the following dependencies were
  added: 'xctest-dynamic-overlay' (https://github.com/pointfreeco/xctest-dynamic-overlay)

Cause

swift-custom-dump depends on a package that was renamed: older SwiftPM resolves it under the
identity xctest-dynamic-overlay, newer SwiftPM under swift-issue-reporting. The lockfile
records whichever identity the toolchain that wrote it chose, and --force-resolved-versions
then refuses on the other one. The committed file pins swift-issue-reporting, which is what a
current Xcode writes; CI runs Xcode 26.4.1, which wants the old name. Regenerating the file just
moves the failure to whoever runs the other toolchain.

Fix

swift-custom-dump is a test-only dependency, used for expectNoDifference in two files, eleven
call sites, every one of them comparing two Strings. XCTAssertEqual prints both sides of a
string mismatch already, so the diff view buys nothing here and the package is paying for two
dependencies and a toolchain-dependent lockfile to get it.

Dropping it takes swift-custom-dump and swift-issue-reporting out of the graph, which leaves
six pins that every toolchain agrees on.

swift test --package-path LocalPackages/CodeEditSourceEditor --force-resolved-versions:
102 Swift Testing cases and 111 XCTest cases (2 skipped), 0 failures.

No CHANGELOG entry: test dependencies are not user-facing.

@datlechin
datlechin changed the base branch from main to fix/grammars-resource-bundle-lookup September 15, 2026 07:57
Base automatically changed from fix/grammars-resource-bundle-lookup to main September 15, 2026 08:06
…ckfile

# Conflicts:
#	LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+IndentTests.swift
#	LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+MoveLinesTests.swift
@datlechin
datlechin merged commit 8e03d46 into main Sep 15, 2026
6 of 7 checks passed
@datlechin
datlechin deleted the fix/editor-package-lockfile branch September 15, 2026 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant