Fix @_implementationOnly warnings

soto-project · Mar 25, 2024 · 4854964 · 4854964
1 parent 80074a8
commit 4854964
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 13 deletions.
diff --git a/Benchmark/Sources/soto-benchmark/EncoderSuites.swift b/Benchmark/Sources/soto-benchmark/EncoderSuites.swift
@@ -15,7 +15,11 @@
 import Benchmark
 import Foundation
 import SotoCore
-import SotoXML
+#if compiler(>=5.10)
+internal import SotoXML
+#else
+@_implementationOnly import SotoXML
+#endif
 
 protocol EncoderProtocol {
     associatedtype Output

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Soto for AWS open source project
@@ -15,6 +15,11 @@
 
 import PackageDescription
 
+let swiftSettings: [SwiftSetting] = [
+    .enableExperimentalFeature("StrictConcurrency=complete"),
+    .enableExperimentalFeature("AccessLevelOnImport"),
+]
+
 let package = Package(
     name: "soto-core",
     platforms: [
@@ -59,13 +64,18 @@ let package = Package(
                 .product(name: "NIOFoundationCompat", package: "swift-nio"),
                 .product(name: "JMESPath", package: "jmespath.swift"),
                 .product(name: "Tracing", package: "swift-distributed-tracing"),
-            ]
+            ],
+            swiftSettings: swiftSettings
+        ),
+        .target(
+            name: "SotoSignerV4",
+            dependencies: [
+                .product(name: "Crypto", package: "swift-crypto"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOHTTP1", package: "swift-nio"),
+            ],
+            swiftSettings: swiftSettings
         ),
-        .target(name: "SotoSignerV4", dependencies: [
-            .product(name: "Crypto", package: "swift-crypto"),
-            .product(name: "NIOCore", package: "swift-nio"),
-            .product(name: "NIOHTTP1", package: "swift-nio"),
-        ]),
         .target(name: "SotoTestUtils", dependencies: [
             .byName(name: "SotoCore"),
             .byName(name: "SotoXML"),
@@ -76,12 +86,19 @@ let package = Package(
             .product(name: "NIOPosix", package: "swift-nio"),
             .product(name: "NIOTestUtils", package: "swift-nio"),
         ]),
-        .target(name: "SotoXML", dependencies: [
-            .byName(name: "CSotoExpat"),
-        ]),
+        .target(
+            name: "SotoXML",
+            dependencies: [
+                .byName(name: "CSotoExpat"),
+            ],
+            swiftSettings: swiftSettings
+        ),
         .target(name: "CSotoExpat", dependencies: []),
-        .target(name: "INIParser", dependencies: []),
-
+        .target(
+            name: "INIParser",
+            dependencies: [],
+            swiftSettings: swiftSettings
+        ),
         .testTarget(
             name: "SotoCoreTests",
             dependencies: [

diff --git a/Sources/SotoCore/Encoder/EventStreamDecoder.swift b/Sources/SotoCore/Encoder/EventStreamDecoder.swift
@@ -14,7 +14,11 @@
 
 import Foundation
 import NIOCore
+#if compiler(>=5.10)
+internal import SotoXML
+#else
 @_implementationOnly import SotoXML
+#endif
 
 /// Event stream decoder. Decodes top level `:event-type` header and then passes the payload
 /// to another decoder based off the `:content-type` header

diff --git a/Sources/SotoCore/HTTP/AWSHTTPRequest.swift b/Sources/SotoCore/HTTP/AWSHTTPRequest.swift
@@ -21,7 +21,11 @@ import NIOCore
 import NIOFoundationCompat
 import NIOHTTP1
 import SotoSignerV4
+#if compiler(>=5.10)
+internal import SotoXML
+#else
 @_implementationOnly import SotoXML
+#endif
 
 /// Object encapsulating all the information needed to generate a raw HTTP request to AWS
 public struct AWSHTTPRequest {

diff --git a/Sources/SotoCore/HTTP/AWSHTTPResponse.swift b/Sources/SotoCore/HTTP/AWSHTTPResponse.swift
@@ -24,7 +24,11 @@ import Logging
 import NIOCore
 import NIOFoundationCompat
 import NIOHTTP1
+#if compiler(>=5.10)
+internal import SotoXML
+#else
 @_implementationOnly import SotoXML
+#endif
 
 /// Structure encapsulating an HTTP Response
 public struct AWSHTTPResponse {

diff --git a/Sources/SotoCore/Middleware/Middleware/S3Middleware.swift b/Sources/SotoCore/Middleware/Middleware/S3Middleware.swift
@@ -15,7 +15,11 @@
 import Crypto
 import Foundation
 @_spi(SotoInternal) import SotoSignerV4
+#if compiler(>=5.10)
+internal import SotoXML
+#else
 @_implementationOnly import SotoXML
+#endif
 
 /// Middleware applied to S3 service
 ///