Skip to content

Commit 0dce331

Browse files
authored
Merge branch 'main' into enable_static_sdk_ci
2 parents 9e471b1 + da9f6ae commit 0dce331

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1515
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1616
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
17-
linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
17+
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1818
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1919

2020
static-sdk:

.github/workflows/pull_request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1919
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
2020
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
21-
linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
21+
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2222
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2323

2424
cxx-interop:

Package.swift

+4-1
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,14 @@ let package = Package(
5454

5555
// --- STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //
5656
for target in package.targets {
57-
if target.type != .plugin {
57+
switch target.type {
58+
case .regular, .test, .executable:
5859
var settings = target.swiftSettings ?? []
5960
// https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md
6061
settings.append(.enableUpcomingFeature("MemberImportVisibility"))
6162
target.swiftSettings = settings
63+
case .macro, .plugin, .system, .binary: () // not applicable
64+
@unknown default: () // we don't know what to do here, do nothing
6265
}
6366
}
6467
// --- END: STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //

0 commit comments

Comments
 (0)