Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: CodeQL

on:
push:
branches:
- main
pull_request:
branches:
- main
schedule:
- cron: "23 4 * * 1"

permissions:
actions: read
contents: read
security-events: write

jobs:
analyze-actions:
name: Analyze (actions)
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
steps:
- uses: actions/checkout@v6
- uses: github/codeql-action/init@v4
with:
languages: actions
build-mode: none
- uses: github/codeql-action/analyze@v4
with:
category: /language:actions

analyze-swift:
name: Analyze (swift)
runs-on: macos-15
permissions:
actions: read
contents: read
security-events: write
steps:
- uses: actions/checkout@v6
- run: sudo xcode-select -s /Applications/Xcode_26.0.app
- uses: github/codeql-action/init@v4
with:
languages: swift
build-mode: manual
- run: swift build --configuration release
- uses: github/codeql-action/analyze@v4
with:
category: /language:swift
15 changes: 7 additions & 8 deletions .github/workflows/file-system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: macos-15
steps:
- uses: actions/checkout@v6
- run: sudo xcode-select -s /Applications/Xcode_16.3.app
- run: sudo xcode-select -s /Applications/Xcode_26.0.app
- uses: jdx/mise-action@v3
- name: Run
run: mise run build-spm
Expand All @@ -37,10 +37,9 @@ jobs:

test:
name: "Test on macOS"
runs-on: macos-15
runs-on: macos-26
steps:
- uses: actions/checkout@v6
- run: sudo xcode-select -s /Applications/Xcode_16.3.app
- uses: jdx/mise-action@v3
- name: Run
run: mise run test-spm
Expand All @@ -63,8 +62,8 @@ jobs:
- uses: compnerd/gha-setup-vsdevenv@main
- uses: compnerd/gha-setup-swift@main
with:
swift-version: swift-6.0.3-release
swift-build: 6.0.3-RELEASE
swift-version: swift-6.2-release
swift-build: 6.2-RELEASE
update-sdk-modules: true
- name: Build
run: swift build --configuration release
Expand All @@ -78,8 +77,8 @@ jobs:
- uses: compnerd/gha-setup-vsdevenv@main
- uses: compnerd/gha-setup-swift@main
with:
swift-version: swift-6.0.3-release
swift-build: 6.0.3-RELEASE
swift-version: swift-6.2-release
swift-build: 6.2-RELEASE
update-sdk-modules: true
- name: Test
run: swift test
Expand All @@ -89,7 +88,7 @@ jobs:
runs-on: macos-15
steps:
- uses: actions/checkout@v6
- run: sudo xcode-select -s /Applications/Xcode_16.3.app
- run: sudo xcode-select -s /Applications/Xcode_26.0.app
- uses: jdx/mise-action@v3
- name: Run
run: mise run lint
2 changes: 1 addition & 1 deletion .mise/tasks/build-linux
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ fi
$CONTAINER_RUNTIME run --rm \
--volume "$MISE_PROJECT_ROOT:/package" \
--workdir "/package" \
swift:6.1.0 \
swift:6.2 \
/bin/bash -c \
"swift build --configuration release --build-path ./.build/linux"
2 changes: 1 addition & 1 deletion .mise/tasks/test-linux
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ fi
$CONTAINER_RUNTIME run --rm \
--volume "$MISE_PROJECT_ROOT:/package" \
--workdir "/package" \
swift:6.1.0 \
swift:6.2 \
/bin/bash -c \
"swift test"
91 changes: 77 additions & 14 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 9 additions & 18 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,33 +1,25 @@
// swift-tools-version: 5.8.1
// swift-tools-version: 6.2
// The swift-tools-version declares the minimum version of Swift required to build this package.

@preconcurrency import PackageDescription
import PackageDescription

#if os(Windows)
let zipFoundationDependency: [Package.Dependency] = []
let zipFoundationTarget: [Target.Dependency] = []
let swiftNioDependency: [Package.Dependency] = []
let swiftNioTarget: [Target.Dependency] = []
#else
let zipFoundationDependency: [Package.Dependency] = [
.package(url: "https://github.com/tuist/ZIPFoundation", .upToNextMajor(from: "0.9.20")),
]
let zipFoundationTarget: [Target.Dependency] = [
.product(name: "ZIPFoundation", package: "ZIPFoundation"),
]
let swiftNioDependency: [Package.Dependency] = [
.package(url: "https://github.com/apple/swift-nio", .upToNextMajor(from: "2.92.0")),
]
let swiftNioTarget: [Target.Dependency] = [
.product(name: "_NIOFileSystem", package: "swift-nio"),
]
#endif

let package = Package(
name: "FileSystem",
platforms: [
.macOS("13.0"),
.iOS("16.0"),
.macOS("26.0"),
.iOS("26.0"),
],
products: [
.library(
Expand All @@ -47,17 +39,19 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/coenttb/swift-file-system", .upToNextMajor(from: "0.6.0")),
.package(url: "https://github.com/tuist/Path", .upToNextMajor(from: "0.3.8")),
.package(url: "https://github.com/apple/swift-log", .upToNextMajor(from: "1.10.1")),
] + zipFoundationDependency + swiftNioDependency,
] + zipFoundationDependency,
targets: [
.target(
name: "FileSystem",
dependencies: [
"Glob",
.product(name: "File System", package: "swift-file-system"),
.product(name: "Path", package: "Path"),
.product(name: "Logging", package: "swift-log"),
] + zipFoundationTarget + swiftNioTarget,
] + zipFoundationTarget,
swiftSettings: [
.define("MOCKING", .when(configuration: .debug)),
]
Expand All @@ -82,10 +76,7 @@ let package = Package(
]
),
.target(
name: "Glob",
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency"),
]
name: "Glob"
),
.testTarget(
name: "GlobTests",
Expand Down
Loading
Loading