Skip to content

Commit 3a331d3

Browse files
authored
Merge pull request #27 from owenv/owenv/deployment-targets
Add iOS/Catalyst deployment targets
2 parents 958dc3a + aeca1aa commit 3a331d3

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
windows_swift_versions: '["nightly-main"]'
2424
enable_linux_static_sdk_build: true
2525
enable_macos_checks: true
26+
enable_ios_checks: true
2627
macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
2728
macos_pre_build_command: ./.github/scripts/prebuild.sh
2829
cmake-smoke-test:

Package.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,11 @@ if buildOnlyTests {
206206

207207
let package = Package(
208208
name: "swift-tools-protocols",
209-
platforms: [.macOS(.v14)],
209+
platforms: [
210+
.macOS(.v14),
211+
.iOS(.v17),
212+
.macCatalyst(.v17),
213+
],
210214
products: products,
211215
dependencies: dependencies,
212216
targets: targets,

Sources/LanguageServerProtocolTransport/JSONRPCConnection.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ public final class JSONRPCConnection: Connection {
196196
sendIO.setLimit(highWater: Int.max)
197197
}
198198

199+
#if os(macOS) || !canImport(Darwin)
199200
/// Creates and starts a `JSONRPCConnection` that connects to a subprocess launched with the specified arguments.
200201
///
201202
/// `client` is the message handler that handles the messages sent from the subprocess to SourceKit-LSP.
@@ -267,6 +268,7 @@ public final class JSONRPCConnection: Connection {
267268

268269
return (connection, process)
269270
}
271+
#endif // os(macOS) || !canImport(Darwin)
270272

271273
deinit {
272274
assert(state == .closed)

Sources/ToolsProtocolsTestSupport/PerfTestCase.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ open class PerfTestCase: XCTestCase {
2424

2525
#if !ENABLE_PERF_TESTS
2626

27-
#if os(macOS)
27+
#if canImport(Darwin)
2828
open override func startMeasuring() {}
2929
open override func stopMeasuring() {}
3030
open override func measureMetrics(

0 commit comments

Comments
 (0)