Skip to content

build: unpin FileType from fork now that upstream 2.2.1 ships the Linux fix#553

Merged
cohoe merged 1 commit into
jocosocial:masterfrom
penguinboi:fix/filetype-unpin
Jul 1, 2026
Merged

build: unpin FileType from fork now that upstream 2.2.1 ships the Linux fix#553
cohoe merged 1 commit into
jocosocial:masterfrom
penguinboi:fix/filetype-unpin

Conversation

@penguinboi

Copy link
Copy Markdown
Contributor

What

Switches the FileType dependency from my personal fork back to upstream velocityzen/FileType, pinned from: "2.2.1".

Why

The fork (penguinboi/FileType@acfd132) existed for one reason: it renamed FileType's system zlib module (CZlibFTZlib) so it wouldn't collide with ZIPFoundation's own CZlib module and break the Linux build.

Upstream has since merged that exact rename (velocityzen/FileType#3, merged 2026-06-21) and shipped it in tag 2.2.1, whose Sources/ contains the renamed FTZlib module. So Swiftarr can depend on upstream directly again — no more reliance on a personal fork, and from: restores normal SemVer range resolution to match every other dependency in the manifest.

Changes

  • Package.swift — fork+revision pin → .package(url: "https://github.com/velocityzen/FileType", from: "2.2.1"); removed the now-obsolete "pinned to a fork" comment.
  • Package.resolved — regenerated. Only the FileType pin moves (fork → upstream 2.2.1); no other dependency versions change.

Verification

  • swift build — clean (full swiftarr target links; FileType 2.2.1 and ZIPFoundation — the old collision pair — compile together).
  • Pure-helper test suite (swift test --filter …, same set CI runs) — 170 tests, 0 failures.
  • Local build is macOS; the collision this addresses is Linux-specific, so the swift:6.2-noble CI job here is the definitive check.

…ux fix

The fork existed only to rename FileType's system zlib module (CZlib ->
FTZlib) so it wouldn't collide with ZIPFoundation's CZlib on Linux.
velocityzen/FileType merged that rename (PR jocosocial#3) and released it in 2.2.1,
so Swiftarr can depend on upstream directly again.

Switches the pin from penguinboi/FileType@acfd132 to
velocityzen/FileType from 2.2.1, restoring SemVer range resolution to
match the other dependencies. Verified with a full swift build and the
pure-helper test suite (170 tests, 0 failures).
@cohoe cohoe merged commit 3d4f47d into jocosocial:master Jul 1, 2026
4 checks passed
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.

3 participants