From 52348898fd70c5999677b0acb8a96bcdd9f7d067 Mon Sep 17 00:00:00 2001 From: Daniel Jin Date: Wed, 17 Jul 2024 17:37:37 -0700 Subject: [PATCH 1/2] Update smoke-http and smoke-aws to 3.0.0 --- Package.resolved | 30 ++++++++++++++++++++++++------ Package.swift | 4 ++-- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Package.resolved b/Package.resolved index 7c7aa13..f747f6c 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/amzn/smoke-aws.git", "state": { "branch": null, - "revision": "24c05c5faa12a4662584241bebee0a017c3ce9bf", - "version": "2.44.174" + "revision": "2ab12570ff4e45b41f3c1adf9204baf57d9c0147", + "version": "3.0.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/amzn/smoke-aws-support.git", "state": { "branch": null, - "revision": "7bdcbdb7b01bf54dfbdeb99d38d8e6edd6a560c1", - "version": "1.1.0" + "revision": "b858670eac000b3a957d85672b915c03275c0d9b", + "version": "2.0.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/amzn/smoke-http.git", "state": { "branch": null, - "revision": "77c629dc155170e15cb845ac9504355744328204", - "version": "2.17.1" + "revision": "a6f386fc42d4758719b01a4e45f20c68bed88d50", + "version": "3.0.0" } }, { @@ -73,6 +73,15 @@ "version": "1.1.7" } }, + { + "package": "swift-distributed-tracing", + "repositoryURL": "https://github.com/apple/swift-distributed-tracing.git", + "state": { + "branch": null, + "revision": "11c756c5c4d7de0eeed8595695cadd7fa107aa19", + "version": "1.1.1" + } + }, { "package": "swift-log", "repositoryURL": "https://github.com/apple/swift-log.git", @@ -136,6 +145,15 @@ "version": "1.15.0" } }, + { + "package": "swift-service-context", + "repositoryURL": "https://github.com/apple/swift-service-context.git", + "state": { + "branch": null, + "revision": "ce0141c8f123132dbd02fd45fea448018762df1b", + "version": "1.0.0" + } + }, { "package": "XMLCoding", "repositoryURL": "https://github.com/LiveUI/XMLCoding.git", diff --git a/Package.swift b/Package.swift index d2f731c..6cb6aa6 100644 --- a/Package.swift +++ b/Package.swift @@ -26,8 +26,8 @@ let package = Package( targets: ["SmokeDynamoDB"]), ], dependencies: [ - .package(url: "https://github.com/amzn/smoke-aws.git", from: "2.42.37"), - .package(url: "https://github.com/amzn/smoke-http.git", from: "2.16.0"), + .package(url: "https://github.com/amzn/smoke-aws.git", from: "3.0.0"), + .package(url: "https://github.com/amzn/smoke-http.git", from: "3.0.0"), .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), .package(url: "https://github.com/apple/swift-metrics.git", "1.0.0"..<"3.0.0"), .package(url: "https://github.com/JohnSundell/CollectionConcurrencyKit", from :"0.2.0") From 22819eb3fcda029c6c38353ccf40bf85b0402e9d Mon Sep 17 00:00:00 2001 From: Daniel Jin Date: Wed, 17 Jul 2024 17:57:19 -0700 Subject: [PATCH 2/2] Bump minimum swift version to 5.7 --- .github/workflows/swift.yml | 8 ++++---- Package.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 56c9bf6..90eb17d 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -12,10 +12,10 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-20.04] - swift: ["5.8"] + swift: ["5.9"] runs-on: ${{ matrix.os }} steps: - - uses: swift-actions/setup-swift@v1.23.0 + - uses: swift-actions/setup-swift@v1.25.0 with: swift-version: ${{ matrix.swift }} - uses: actions/checkout@v2 @@ -28,10 +28,10 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - swift: ["5.7.3", "5.6.3"] + swift: ["5.8.1", "5.7.3"] runs-on: ${{ matrix.os }} steps: - - uses: swift-actions/setup-swift@v1.23.0 + - uses: swift-actions/setup-swift@v1.25.0 with: swift-version: ${{ matrix.swift }} - uses: actions/checkout@v2 diff --git a/Package.swift b/Package.swift index 6cb6aa6..de74660 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.7 // // Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. //