diff --git a/Package@swift-5.6.swift b/Package@swift-5.6.swift new file mode 100644 index 00000000..f8dccfbd --- /dev/null +++ b/Package@swift-5.6.swift @@ -0,0 +1,33 @@ +// swift-tools-version:5.6 +//===----------------------------------------------------------------------===// +// +// This source file is part of the Swift Logging API open source project +// +// Copyright (c) 2018-2019 Apple Inc. and the Swift Logging API project authors +// Licensed under Apache License v2.0 +// +// See LICENSE.txt for license information +// See CONTRIBUTORS.txt for the list of Swift Logging API project authors +// +// SPDX-License-Identifier: Apache-2.0 +// +//===----------------------------------------------------------------------===// + +import PackageDescription + +let package = Package( + name: "swift-log", + products: [ + .library(name: "Logging", targets: ["Logging"]), + ], + targets: [ + .target( + name: "Logging", + dependencies: [] + ), + .testTarget( + name: "LoggingTests", + dependencies: ["Logging"] + ), + ] +) diff --git a/Sources/Logging/Documentation.docc/Logger.md b/Sources/Logging/Documentation.docc/Logger.md new file mode 100644 index 00000000..c9ceda42 --- /dev/null +++ b/Sources/Logging/Documentation.docc/Logger.md @@ -0,0 +1,13 @@ +# ``Logging/Logger/Level`` + +## Topics + +### Log levels + +- ``trace`` +- ``debug`` +- ``info`` +- ``notice`` +- ``warning`` +- ``error`` +- ``critical`` diff --git a/docker/docker-compose.2004.56.yaml b/docker/docker-compose.2004.56.yaml index 76366ee8..9b025bb4 100644 --- a/docker/docker-compose.2004.56.yaml +++ b/docker/docker-compose.2004.56.yaml @@ -11,7 +11,8 @@ services: test: image: swift-log:20.04-5.6 - environment: [] + environment: + - FORCE_TEST_DISCOVERY=--enable-test-discovery #- SANITIZER_ARG=--sanitize=thread shell: diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml index 13a8d05f..94c5b5a0 100644 --- a/docker/docker-compose.2004.57.yaml +++ b/docker/docker-compose.2004.57.yaml @@ -10,7 +10,8 @@ services: test: image: swift-log:20.04-5.7 - environment: [] + environment: + - FORCE_TEST_DISCOVERY=--enable-test-discovery #- SANITIZER_ARG=--sanitize=thread shell: diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml index 377cd272..e73688eb 100644 --- a/docker/docker-compose.2004.main.yaml +++ b/docker/docker-compose.2004.main.yaml @@ -10,7 +10,8 @@ services: test: image: swift-log:20.04-main - environment: [] + environment: + - FORCE_TEST_DISCOVERY=--enable-test-discovery #- SANITIZER_ARG=--sanitize=thread shell: diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 69ab5c73..3d52128b 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -28,7 +28,7 @@ services: test: <<: *common - command: /bin/bash -xcl "swift test -Xswiftc -warnings-as-errors $${SANITIZER_ARG-}" + command: /bin/bash -xcl "swift test -Xswiftc -warnings-as-errors $${FORCE_TEST_DISCOVERY-} $${SANITIZER_ARG-}" # util diff --git a/scripts/soundness.sh b/scripts/soundness.sh index f2a00dc4..acde75e9 100755 --- a/scripts/soundness.sh +++ b/scripts/soundness.sh @@ -86,7 +86,7 @@ for language in swift-or-c bash dtrace; do matching_files=( -name '*' ) case "$language" in swift-or-c) - exceptions=( -name c_nio_http_parser.c -o -name c_nio_http_parser.h -o -name cpp_magic.h -o -name Package.swift -o -name CNIOSHA1.h -o -name c_nio_sha1.c -o -name ifaddrs-android.c -o -name ifaddrs-android.h) + exceptions=( -name c_nio_http_parser.c -o -name c_nio_http_parser.h -o -name cpp_magic.h -o -name Package.swift -o name Package-swift5.6.swift -o -name CNIOSHA1.h -o -name c_nio_sha1.c -o -name ifaddrs-android.c -o -name ifaddrs-android.h) matching_files=( -name '*.swift' -o -name '*.c' -o -name '*.h' ) cat > "$tmp" <<"EOF" //===----------------------------------------------------------------------===//