Apply standard Swift package configuration (#386)

* Apply standard Swift package configuration

* Use iPhone 17

* Remove extraneous comma

Author: tinder-cfuller

.github/workflows/docc.yml

@@ -7,14 +7,16 @@ on:
     branches: [ main ]
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_26.3.app/Contents/Developer
 
 jobs:
   docc:
     name: DocC
     runs-on: macos-latest
+    permissions:
+      contents: read
     steps:
     - name: Checkout source
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Build
       run: make docs open="no" DERIVED_DATA_PATH="$(mktemp -d)"

.github/workflows/pages.yml

@@ -5,7 +5,7 @@ on:
     tags: ['[0-9]+.[0-9]+.[0-9]+']
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_26.3.app/Contents/Developer
 
 permissions:
   contents: read
@@ -23,9 +23,11 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: macos-latest
+    permissions:
+      contents: read
     steps:
     - name: Checkout source
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Configure pages
       uses: actions/configure-pages@v5
     - name: Build documentation

.github/workflows/swift.yml

@@ -7,22 +7,24 @@ on:
     branches: [ main ]
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_26.3.app/Contents/Developer
 
 jobs:
   swift:
     name: Swift
     runs-on: macos-latest
+    permissions:
+      contents: read
     env:
-      SIMULATOR: iPhone 15
+      SIMULATOR: iPhone 17
     steps:
     - name: Checkout source
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Download swiftlint binary
       run: swift package resolve
     - name: Lint
       run: >
-        "$(find ".build/artifacts/swiftlint" -type f -name swiftlint -perm +111 -print -quit)"
+        "$(find ".build/artifacts/swiftlint" -path "*macos*" -type f -name swiftlint -perm +111 -print -quit)"
         lint --strict --reporter github-actions-logging
     - name: Resolve package dependencies
       run: xcodebuild -resolvePackageDependencies

.swiftlint-rules.yml

@@ -9,8 +9,9 @@ only_rules:
 - accessibility_label_for_image
 - accessibility_trait_for_button
 - anonymous_argument_in_multiline_closure
-- anyobject_protocol
 - array_init
+- async_without_await
+- attribute_name_spacing
 # - attributes
 - balanced_xctest_lifecycle
 - blanket_disable_command
@@ -94,7 +95,6 @@ only_rules:
 - implicitly_unwrapped_optional
 - inclusive_language
 # - indentation_width
-- inert_defer
 - invalid_swiftlint_command
 - is_disjoint
 - joined_default_parameter
@@ -145,6 +145,7 @@ only_rules:
 - opening_brace
 - operator_usage_whitespace
 - operator_whitespace
+- optional_data_string_conversion
 - optional_enum_case_matching
 - orphaned_doc_comment
 - overridden_super_call
@@ -155,6 +156,7 @@ only_rules:
 - prefer_nimble
 - prefer_self_in_static_references
 - prefer_self_type_over_type_of_self
+- prefer_type_checking
 - prefer_zero_over_explicit_init
 # - prefixed_toplevel_constant
 - private_action
@@ -177,6 +179,7 @@ only_rules:
 - redundant_objc_attribute
 - redundant_optional_initialization
 - redundant_self_in_closure
+- redundant_sendable
 - redundant_set_access_control
 # - redundant_string_enum_value
 - redundant_type_annotation
@@ -224,7 +227,6 @@ only_rules:
 - unneeded_synthesized_initializer
 - unowned_variable_capture
 - untyped_error_in_catch
-- unused_capture_list
 - unused_closure_parameter
 - unused_control_flow_label
 - unused_enumerated

Makefile

@@ -47,23 +47,6 @@ delete-snapshots:
 		echo "Deleted $$snapshots"; \
 	done
 
-.PHONY: site
-site: target ?= Layout
-site: prefix ?= $(shell pwd)
-site: DOCC_PATH = $(shell xcrun --find docc)
-site: ARCHIVE_PATH = .build/documentation/archive
-site:
-	@make docs open="no"
-	"$(DOCC_PATH)" process-archive \
-		transform-for-static-hosting \
-		"$(ARCHIVE_PATH)/$(target).doccarchive" \
-		--hosting-base-path "/$(target)" \
-		--output-path "$(prefix)/_site"
-	cp docs.html "$(prefix)/_site/index.html"
-	cp docs.html "$(prefix)/_site/documentation/index.html"
-	mkdir -p "$(prefix)/_site/cheatsheet"
-	cp cheatsheet.html "$(prefix)/_site/cheatsheet/index.html"
-
 .PHONY: docs
 docs: target ?= Layout
 docs: destination ?= generic/platform=iOS
@@ -83,3 +66,20 @@ docs:
 		-name "$(target).doccarchive" \
 		-exec cp -R {} "$(ARCHIVE_PATH)/" \;
 	$(if $(filter $(open),OPEN),@open "$(ARCHIVE_PATH)/$(target).doccarchive",)
+
+.PHONY: site
+site: target ?= Layout
+site: prefix ?= $(shell pwd)
+site: DOCC_PATH = $(shell xcrun --find docc)
+site: ARCHIVE_PATH = .build/documentation/archive
+site:
+	@make docs open="no"
+	"$(DOCC_PATH)" process-archive \
+		transform-for-static-hosting \
+		"$(ARCHIVE_PATH)/$(target).doccarchive" \
+		--hosting-base-path "$(target)" \
+		--output-path "$(prefix)/_site"
+	cp docs.html "$(prefix)/_site/index.html"
+	cp docs.html "$(prefix)/_site/documentation/index.html"
+	mkdir -p "$(prefix)/_site/cheatsheet"
+	cp cheatsheet.html "$(prefix)/_site/cheatsheet/index.html"

Package.resolved

@@ -1,7 +1,13 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.10
 
+import Foundation
 import PackageDescription
 
+let environment = ProcessInfo.processInfo.environment
+
+let treatWarningsAsErrors = environment["CI"] == "true"
+let enableSwiftLintBuildToolPlugin = environment["CODEQL_DIST"] == nil
+
 let package = Package(
     name: "Layout",
     platforms: [
@@ -19,13 +25,13 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/realm/SwiftLint.git",
-            exact: "0.56.2"),
+            exact: "0.59.1"),
         .package(
             url: "https://github.com/Quick/Nimble.git",
-            exact: "13.4.0"),
+            exact: "14.0.0"),
         .package(
             url: "https://github.com/pointfreeco/swift-snapshot-testing.git",
-            exact: "1.17.4"),
+            exact: "1.18.9"),
     ],
     targets: [
         .target(
@@ -52,11 +58,21 @@ 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")]
 
-    target.plugins = [
-        .plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLint"),
-    ]
+    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 ?? []) + [
+            .plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLint"),
+        ]
+    }
 }

Package.swift

@@ -56,7 +56,7 @@ public enum ConstraintsBuilder {
     /// https://docs.swift.org/swift-book/documentation/the-swift-programming-language/attributes/#resultBuilder
     /// ) for more information.
     public static func buildBlock(_ components: Component...) -> Component {
-        components.flatMap { $0 }
+        components.flatMap(\.self)
     }
 
     /// See result builder [documentation](
@@ -84,7 +84,7 @@ public enum ConstraintsBuilder {
     /// https://docs.swift.org/swift-book/documentation/the-swift-programming-language/attributes/#resultBuilder
     /// ) for more information.
     public static func buildArray(_ components: [Component]) -> Component {
-        components.flatMap { $0 }
+        components.flatMap(\.self)
     }
 
     /// See result builder [documentation](

Sources/Layout/Builders/ConstraintsBuilder.swift

@@ -54,7 +54,7 @@ public enum LayoutBuilder {
     /// https://docs.swift.org/swift-book/documentation/the-swift-programming-language/attributes/#resultBuilder
     /// ) for more information.
     public static func buildBlock(_ components: Component...) -> Component {
-        components.flatMap { $0 }
+        components.flatMap(\.self)
     }
 
     /// See result builder [documentation](
@@ -82,7 +82,7 @@ public enum LayoutBuilder {
     /// https://docs.swift.org/swift-book/documentation/the-swift-programming-language/attributes/#resultBuilder
     /// ) for more information.
     public static func buildArray(_ components: [Component]) -> Component {
-        components.flatMap { $0 }
+        components.flatMap(\.self)
     }
 
     /// See result builder [documentation](