Skip to content
Merged
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
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
- os: macos-15
build-system: swift
swift-version: '6.1'
xcode-version: '16.4'
- os: ubuntu-latest
build-system: swift
swift-version: '6.1'
Expand All @@ -39,7 +40,9 @@ jobs:
# swift-version: ${{ matrix.swift-version }}

- name: Setup Xcode
if: matrix.build-system == 'xcodebuild'
# Select Xcode for swift and xcodebuild.
# We need 6.1 swift and setup-swift@v2 is broken.
if: matrix.xcode-version != ''
run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode-version }}.app'

- name: Cache Swift packages
Expand Down
8 changes: 6 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ let package = Package(
],

targets: [

.executableTarget(
name: "CommandLine",
dependencies: [
Expand All @@ -31,7 +31,7 @@ let package = Package(
"Utils",
]
),

.target(
name: "BinaryDependencyManager",
dependencies: [
Expand Down Expand Up @@ -60,5 +60,9 @@ let package = Package(
.target(name: "Utils"),
]
),
],

swiftLanguageVersions: [
.version("6")
]
)
2 changes: 1 addition & 1 deletion Sources/BinaryDependencyManager/Models/Dependency.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extension Dependency: Encodable {
// MARK: - Dependency.Asset

extension Dependency {
public struct Asset: Equatable {
public struct Asset: Equatable, Sendable {
/// SHA-256 checksum of the zip archive.
public let checksum: String
/// Regex pattern to a specific artifact, if multiple artifacts are added to the the release assets.
Expand Down
2 changes: 1 addition & 1 deletion Sources/CommandLine/Commands/CleanCommand.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import BinaryDependencyManager

struct CleanCommand: ParsableCommand {

static var configuration = CommandConfiguration(commandName: "clean")
static let configuration = CommandConfiguration(commandName: "clean")

/// Path to the output directory.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/CommandLine/Commands/ResolveCommand.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Yams
import Utils

struct ResolveCommand: ParsableCommand {
static var configuration = CommandConfiguration(
static let configuration = CommandConfiguration(
commandName: "resolve",
version: BinaryDependenciesManager.configuration.version
)
Expand Down
10 changes: 8 additions & 2 deletions Sources/CommandLine/main.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
#if os(Linux)
// Glibc import must be the first import.
// Issue: https://github.com/swiftlang/swift/issues/77866
@preconcurrency import Glibc
#endif

import ArgumentParser
import Foundation
import Utils
Expand All @@ -11,9 +17,9 @@ setbuf(stdout, nil)

struct BinaryDependenciesManager: ArgumentParser.ParsableCommand {
/// The version of the binary dependencies manager.
static var version: Version = "0.0.4"
static let version: Version = "0.0.4"

static var configuration = CommandConfiguration(
static let configuration = CommandConfiguration(
abstract: "Binary dependencies resolver",
version: version.description,
subcommands: [
Expand Down