Merge branch 'main' into louis/list-available-fix

Author: louisunlimited

.github/workflows/pull_request.yml

@@ -94,6 +94,26 @@ jobs:
       - name: Extract and Run Workflow Tests
         run: cp swiftly-*.tar.gz /root/swiftly.tar.gz && cp test-swiftly-*.tar.gz /root && cd /root && tar zxf test-swiftly-*.tar.gz && ./test-swiftly -y ./swiftly.tar.gz
 
+  release-custom-install-test:
+    name: Test Release - Custom Install Location
+    needs: releasebuildcheck
+    runs-on: ubuntu-latest
+    container:
+      image: "ubuntu:24.04"
+    steps:
+      - name: Prepare System
+        run: apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install ca-certificates gpg tzdata
+      - name: Download Release
+        uses: actions/download-artifact@v4
+        with:
+          name: swiftly-release-x86_64
+      - name: Download Tests
+        uses: actions/download-artifact@v4
+        with:
+          name: swiftly-tests-x86_64
+      - name: Extract and Run Workflow Tests
+        run: cp swiftly-*.tar.gz /root/swiftly.tar.gz && cp test-swiftly-*.tar.gz /root && cd /root && tar zxf test-swiftly-*.tar.gz && ./test-swiftly -y --custom-location ./swiftly.tar.gz
+
   formatcheck:
     name: Format Check
     runs-on: ubuntu-latest

Package.swift

@@ -1,7 +1,11 @@
-// swift-tools-version:5.10
+// swift-tools-version:6.0
 
 import PackageDescription
 
+let swiftSettings = [
+    SwiftSetting.enableUpcomingFeature("MemberImportVisibility"),
+]
+
 let package = Package(
     name: "swiftly",
     platforms: [
@@ -38,7 +42,8 @@ let package = Package(
                 .target(name: "LinuxPlatform", condition: .when(platforms: [.linux])),
                 .target(name: "MacOSPlatform", condition: .when(platforms: [.macOS])),
                 .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
-            ]
+            ],
+            swiftSettings: swiftSettings
         ),
         .executableTarget(
             name: "TestSwiftly",
@@ -47,16 +52,37 @@ let package = Package(
                 .target(name: "SwiftlyCore"),
                 .target(name: "LinuxPlatform", condition: .when(platforms: [.linux])),
                 .target(name: "MacOSPlatform", condition: .when(platforms: [.macOS])),
-            ]
+            ],
+            swiftSettings: swiftSettings
         ),
         .target(
             name: "SwiftlyCore",
             dependencies: [
+                "SwiftlyDownloadAPI",
+                "SwiftlyWebsiteAPI",
                 .product(name: "AsyncHTTPClient", package: "async-http-client"),
                 .product(name: "NIOFoundationCompat", package: "swift-nio"),
                 .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
                 .product(name: "OpenAPIAsyncHTTPClient", package: "swift-openapi-async-http-client"),
             ],
+            swiftSettings: swiftSettings
+        ),
+        .target(
+            name: "SwiftlyDownloadAPI",
+            dependencies: [
+                .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
+            ],
+            swiftSettings: swiftSettings,
+            plugins: [
+                .plugin(name: "OpenAPIGenerator", package: "swift-openapi-generator"),
+            ]
+        ),
+        .target(
+            name: "SwiftlyWebsiteAPI",
+            dependencies: [
+                .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
+            ],
+            swiftSettings: swiftSettings,
             plugins: [
                 .plugin(name: "OpenAPIGenerator", package: "swift-openapi-generator"),
             ]
@@ -98,6 +124,7 @@ let package = Package(
                 "SwiftlyCore",
                 "CLibArchive",
             ],
+            swiftSettings: swiftSettings,
             linkerSettings: [
                 .linkedLibrary("z"),
             ]
@@ -106,7 +133,8 @@ let package = Package(
             name: "MacOSPlatform",
             dependencies: [
                 "SwiftlyCore",
-            ]
+            ],
+            swiftSettings: swiftSettings
         ),
         .systemLibrary(
             name: "CLibArchive",
@@ -120,7 +148,8 @@ let package = Package(
             dependencies: ["Swiftly"],
             resources: [
                 .embedInCode("mock-signing-key-private.pgp"),
-            ]
+            ],
+            swiftSettings: swiftSettings
         ),
     ]
 )

Plugins/GenerateDocsReference/GenerateDocsReferenceError.swift

@@ -1,6 +1,7 @@
 import Foundation
-import PackagePlugin
+@preconcurrency import PackagePlugin
 
+@preconcurrency
 enum GenerateDocsReferencePluginError: Error {
     case unknownBuildConfiguration(String)
     case buildFailed(String)