Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
import Foundation
import PackageDescription

let enableSwiftLintBuildToolPlugin = ProcessInfo.processInfo.environment["CODEQL_DIST"] == nil
let environment = ProcessInfo.processInfo.environment

let treatWarningsAsErrors = environment["CI"] == "true"
let enableSwiftLintBuildToolPlugin = environment["CODEQL_DIST"] == nil

let package = Package(
name: "CollectionBuilders",
Expand Down Expand Up @@ -38,12 +41,20 @@ let package = Package(

package.targets.forEach { target in

target.swiftSettings = [
.enableExperimentalFeature("StrictConcurrency"),
]
// TODO: Remove upon enabling Swift 6 language mode:
target.swiftSettings = (target.swiftSettings ?? []) + [.enableExperimentalFeature("StrictConcurrency")]

if treatWarningsAsErrors {
target.swiftSettings = (target.swiftSettings ?? []) + [
// TODO: Remove unsafe flag upon upgrading to Swift tools v6.2 and uncomment subsequent settings:
.unsafeFlags(["-warnings-as-errors"]),
// .treatAllWarnings(as: .error),
// .treatWarning("DeprecatedDeclaration", as: .warning)
]
}

if enableSwiftLintBuildToolPlugin {
target.plugins = [
target.plugins = (target.plugins ?? []) + [
.plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLint"),
]
}
Expand Down