Skip to content

Commit 9cb4860

Browse files
authored
Disable existential any build setting (#312)
Motivation: On 5.8, if the experiment existential any setting is enabled and a consuming package holds an existential of a type from swift-log without an explicit 'any' then the build will fail. Modifications: - Disable the setting Result: Users of 5.8 aren't broken
1 parent b3a6373 commit 9cb4860

5 files changed

+8
-9
lines changed

Package.swift

+2-8
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515

1616
import PackageDescription
1717

18-
let swiftSettings: [SwiftSetting] = [
19-
.enableUpcomingFeature("ExistentialAny"),
20-
]
21-
2218
let package = Package(
2319
name: "swift-log",
2420
products: [
@@ -27,13 +23,11 @@ let package = Package(
2723
targets: [
2824
.target(
2925
name: "Logging",
30-
dependencies: [],
31-
swiftSettings: swiftSettings
26+
dependencies: []
3227
),
3328
.testTarget(
3429
name: "LoggingTests",
35-
dependencies: ["Logging"],
36-
swiftSettings: swiftSettings
30+
dependencies: ["Logging"]
3731
),
3832
]
3933
)

docker/docker-compose.2204.510.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ services:
1313
environment:
1414
- WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
1515
#- SANITIZER_ARG=--sanitize=thread
16+
# Generated test manifest uses existentials without 'any'.
17+
#- EXISTENTIAL_ANY_ARG=-Xswiftc -enable-upcoming-feature -Xswiftc ExistentialAny
1618

1719
shell:
1820
image: swift-log:22.04-5.10

docker/docker-compose.2204.59.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ services:
1313
image: swift-log:22.04-5.9
1414
environment:
1515
- WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
16+
- EXISTENTIAL_ANY_ARG=-Xswiftc -enable-upcoming-feature -Xswiftc ExistentialAny
1617
#- SANITIZER_ARG=--sanitize=thread
1718

1819
shell:

docker/docker-compose.2204.main.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ services:
1616
- IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
1717
- EXPLICIT_SENDABLE_ARG=-Xswiftc -require-explicit-sendable
1818
- STRICT_CONCURRENCY_ARG=-Xswiftc -strict-concurrency=complete
19+
# Generated test manifest uses existentials without 'any'.
20+
#- EXISTENTIAL_ANY_ARG=-Xswiftc -enable-upcoming-feature -Xswiftc ExistentialAny
1921

2022
shell:
2123
image: swift-log:22.04-main

docker/docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828

2929
test:
3030
<<: *common
31-
command: /bin/bash -xcl "swift test $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} $${EXPLICIT_SENDABLE_ARG-} $${STRICT_CONCURRENCY_ARG-}"
31+
command: /bin/bash -xcl "swift test $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} $${EXPLICIT_SENDABLE_ARG-} $${STRICT_CONCURRENCY_ARG-} $${EXISTENTIAL_ANY_ARG-}"
3232

3333
# util
3434

0 commit comments

Comments
 (0)