diff --git a/Package.swift b/Package.swift index dac0f222..728b0342 100644 --- a/Package.swift +++ b/Package.swift @@ -15,10 +15,6 @@ import PackageDescription -let swiftSettings: [SwiftSetting] = [ - .enableUpcomingFeature("ExistentialAny"), -] - let package = Package( name: "swift-log", products: [ @@ -27,13 +23,11 @@ let package = Package( targets: [ .target( name: "Logging", - dependencies: [], - swiftSettings: swiftSettings + dependencies: [] ), .testTarget( name: "LoggingTests", - dependencies: ["Logging"], - swiftSettings: swiftSettings + dependencies: ["Logging"] ), ] ) diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml index 7985c44d..07bd58d8 100644 --- a/docker/docker-compose.2204.510.yaml +++ b/docker/docker-compose.2204.510.yaml @@ -13,6 +13,8 @@ services: environment: - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors #- SANITIZER_ARG=--sanitize=thread + # Generated test manifest uses existentials without 'any'. + #- EXISTENTIAL_ANY_ARG=-Xswiftc -enable-upcoming-feature -Xswiftc ExistentialAny shell: image: swift-log:22.04-5.10 diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml index c174f47f..1cc67959 100644 --- a/docker/docker-compose.2204.59.yaml +++ b/docker/docker-compose.2204.59.yaml @@ -13,6 +13,7 @@ services: image: swift-log:22.04-5.9 environment: - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors + - EXISTENTIAL_ANY_ARG=-Xswiftc -enable-upcoming-feature -Xswiftc ExistentialAny #- SANITIZER_ARG=--sanitize=thread shell: diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml index 46109331..c3a1358d 100644 --- a/docker/docker-compose.2204.main.yaml +++ b/docker/docker-compose.2204.main.yaml @@ -16,6 +16,8 @@ services: - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error - EXPLICIT_SENDABLE_ARG=-Xswiftc -require-explicit-sendable - STRICT_CONCURRENCY_ARG=-Xswiftc -strict-concurrency=complete + # Generated test manifest uses existentials without 'any'. + #- EXISTENTIAL_ANY_ARG=-Xswiftc -enable-upcoming-feature -Xswiftc ExistentialAny shell: image: swift-log:22.04-main diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 8974de91..502696cb 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -28,7 +28,7 @@ services: test: <<: *common - command: /bin/bash -xcl "swift test $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} $${EXPLICIT_SENDABLE_ARG-} $${STRICT_CONCURRENCY_ARG-}" + command: /bin/bash -xcl "swift test $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} $${EXPLICIT_SENDABLE_ARG-} $${STRICT_CONCURRENCY_ARG-} $${EXISTENTIAL_ANY_ARG-}" # util