From bbace9246dd1bb500fb6b097f92fdaa31e54fcfb Mon Sep 17 00:00:00 2001 From: 417-72KI <417.72ki@gmail.com> Date: Sat, 21 Jun 2025 00:05:38 +0900 Subject: [PATCH 1/3] update runner and Xcode to build --- .github/matrix.json | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/matrix.json b/.github/matrix.json index 438a90b..65a7568 100644 --- a/.github/matrix.json +++ b/.github/matrix.json @@ -1,5 +1,5 @@ { "xcode_version": [ - "15.4" + "16.4" ] } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b77f13d..0af3470 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: test: name: Test needs: generate-matrix - runs-on: macOS-14 + runs-on: macOS-15 strategy: fail-fast: false matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }} From 688fec97d18a39b9734226f8d7eea20ee876b7a4 Mon Sep 17 00:00:00 2001 From: 417-72KI <417.72ki@gmail.com> Date: Sat, 21 Jun 2025 00:07:39 +0900 Subject: [PATCH 2/3] use fork to avoid compilation errors in ClangSwift - error: cannot find 'free' in scope - error: cannot find 'strdup' in scope --- Package.resolved | 6 +++--- Package.swift | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index f86d7c4..fd1b998 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "c483f3216dc774fbab29a9ed7a3fa41520f41face9ed58b798f83b15d8739961", + "originHash" : "42c540e78809b4dfa55e342defd5c41e7c267bbf8a720621ff46a9ac754d0e9d", "pins" : [ { "identity" : "clangswift", "kind" : "remoteSourceControl", - "location" : "https://github.com/llvm-swift/ClangSwift", + "location" : "https://github.com/417-72KI/ClangSwift", "state" : { "branch" : "master", - "revision" : "c540bea54b3d92ebd2df4ad96141d7dbce5307b6" + "revision" : "2a2d8c94f80dc26bf69636092c962abe3f71dee4" } }, { diff --git a/Package.swift b/Package.swift index 8cf174b..9210318 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,8 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.0"), .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.0"), - .package(url: "https://github.com/llvm-swift/ClangSwift", branch: "master"), + // .package(url: "https://github.com/llvm-swift/ClangSwift", branch: "master"), + .package(url: "https://github.com/417-72KI/ClangSwift", branch: "master"), ], targets: [ .executableTarget( From da9bc7a7955af2b130dec0beae89bfc606ee20b8 Mon Sep 17 00:00:00 2001 From: 417-72KI <417.72ki@gmail.com> Date: Sat, 21 Jun 2025 00:06:41 +0900 Subject: [PATCH 3/3] fix: `error: method must be declared internal because its parameter uses an internal type` - note: struct 'URL' imported as 'internal' from 'Foundation' here --- Sources/SBHCCore/SBHCCore.swift | 2 +- Sources/SBSCCore/SBSCCore.swift | 2 +- Sources/Util/ShellExecutor.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/SBHCCore/SBHCCore.swift b/Sources/SBHCCore/SBHCCore.swift index c8bdf31..bd24822 100644 --- a/Sources/SBHCCore/SBHCCore.swift +++ b/Sources/SBHCCore/SBHCCore.swift @@ -1,4 +1,4 @@ -import Foundation +public import Foundation public final class SBHCCore { public init() {} diff --git a/Sources/SBSCCore/SBSCCore.swift b/Sources/SBSCCore/SBSCCore.swift index 1a6fe66..f917bca 100644 --- a/Sources/SBSCCore/SBSCCore.swift +++ b/Sources/SBSCCore/SBSCCore.swift @@ -1,4 +1,4 @@ -import Foundation +public import Foundation public final class SBSCCore { public init() {} diff --git a/Sources/Util/ShellExecutor.swift b/Sources/Util/ShellExecutor.swift index 08489b4..ee4bfe7 100644 --- a/Sources/Util/ShellExecutor.swift +++ b/Sources/Util/ShellExecutor.swift @@ -1,4 +1,4 @@ -import Foundation +public import Foundation public enum ShellExecutor {}