From 358471d6cacf4a87da3056f41771a05c2f781457 Mon Sep 17 00:00:00 2001 From: Adam Fowler Date: Wed, 18 Dec 2024 15:52:10 +0000 Subject: [PATCH] Update Package.swift --- Package.swift | 2 +- .../generate-package/Package.mustache | 31 ++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Package.swift b/Package.swift index 30a7c83598..6339f5abce 100644 --- a/Package.swift +++ b/Package.swift @@ -433,7 +433,7 @@ let package = Package( .library(name: "SotoXRay", targets: ["SotoXRay"]), ], dependencies: [ - .package(url: "https://github.com/soto-project/soto-core.git", branch: "main") + .package(url: "https://github.com/soto-project/soto-core.git", from: "7.3.0") ], targets: [ .target( diff --git a/scripts/templates/generate-package/Package.mustache b/scripts/templates/generate-package/Package.mustache index 13a41ccf21..07fafc06ad 100644 --- a/scripts/templates/generate-package/Package.mustache +++ b/scripts/templates/generate-package/Package.mustache @@ -17,7 +17,7 @@ import PackageDescription let swiftSettings: [SwiftSetting] = [ - .enableExperimentalFeature("StrictConcurrency=complete"), + .enableExperimentalFeature("StrictConcurrency=complete") ] let package = Package( @@ -30,33 +30,48 @@ let package = Package( ], products: [ {{#targets}} - .library(name: "Soto{{name}}", targets: ["Soto{{name}}"]){{^last()}},{{/last()}} + .library(name: "Soto{{name}}", targets: ["Soto{{name}}"]), {{/targets}} ], dependencies: [ - .package(url: "https://github.com/soto-project/soto-core.git", from: "7.2.0") + .package(url: "https://github.com/soto-project/soto-core.git", from: "7.3.0") ], targets: [ {{#targets}} {{#hasExtension}} - .target(name: "_Soto{{name}}Generated", dependencies: [{{#dependencies}}{{.}}{{^last()}}, {{/last()}}{{/dependencies}}], path: "./Sources/Soto/Services/{{name}}", swiftSettings: swiftSettings){{^last()}},{{/last()}} + .target( + name: "_Soto{{name}}Generated", + dependencies: [{{#dependencies}}{{.}}{{^last()}}, {{/last()}}{{/dependencies}}], + path: "./Sources/Soto/Services/{{name}}", + swiftSettings: swiftSettings + ), {{/hasExtension}} {{^hasExtension}} - .target(name: "Soto{{name}}", dependencies: [{{#dependencies}}{{.}}{{^last()}}, {{/last()}}{{/dependencies}}], path: "./Sources/Soto/Services/{{name}}", swiftSettings: swiftSettings), + .target( + name: "Soto{{name}}", + dependencies: [{{#dependencies}}{{.}}{{^last()}}, {{/last()}}{{/dependencies}}], + path: "./Sources/Soto/Services/{{name}}", + swiftSettings: swiftSettings + ), {{/hasExtension}} {{/targets}} // Service extensions {{#extensionTargets}} - .target(name: "Soto{{name}}", dependencies: [{{#dependencies}}{{.}}, {{/dependencies}}"_Soto{{name}}Generated"], path: "./Sources/Soto/Extensions/{{name}}", swiftSettings: swiftSettings), + .target( + name: "Soto{{name}}", + dependencies: [{{#dependencies}}{{.}}, {{/dependencies}}"_Soto{{name}}Generated"], + path: "./Sources/Soto/Extensions/{{name}}", + swiftSettings: swiftSettings + ), {{/extensionTargets}} .testTarget( name: "SotoTests", dependencies: [ {{#testTargets}} - "Soto{{.}}"{{^last()}},{{/last()}} + "Soto{{.}}", {{/testTargets}} ] - ) + ), ] )