From ddee930b3c1bd0726434a7dbe9336d2739d8e01f Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Tue, 18 Jan 2022 00:23:32 +0100 Subject: [PATCH] Update to Apodini 0.7.1 (#5) --- .github/workflows/build.yml | 2 +- .github/workflows/pull_request.yml | 6 +- .github/workflows/release.yml | 4 +- .github/workflows/update.yml | 2 +- Package.resolved | 102 ++++++++++++++++++++++------- Package.swift | 4 +- 6 files changed, 87 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1976124..efaa385 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ on: jobs: build_and_test: name: Build and Test - uses: Apodini/.github/.github/workflows/build-and-test.yml@main + uses: Apodini/.github/.github/workflows/build-and-test.yml@v1 with: packagename: ApodiniObservePrometheus aptgetdependencies: libsqlite3-dev diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index dd93f5a..2cf944b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -15,14 +15,14 @@ on: jobs: build_and_test: name: Build and Test - uses: Apodini/.github/.github/workflows/build-and-test.yml@main + uses: Apodini/.github/.github/workflows/build-and-test.yml@v1 with: packagename: ApodiniObservePrometheus aptgetdependencies: libsqlite3-dev yumdependencies: sqlite-devel reuse_action: name: REUSE Compliance Check - uses: Apodini/.github/.github/workflows/reuse.yml@main + uses: Apodini/.github/.github/workflows/reuse.yml@v1 swiftlint: name: SwiftLint - uses: Apodini/.github/.github/workflows/swiftlint.yml@main + uses: Apodini/.github/.github/workflows/swiftlint.yml@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec33271..48dea19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,6 @@ on: jobs: docs: name: Generate Docs - uses: Apodini/.github/.github/workflows/docs.yml@main + uses: Apodini/.github/.github/workflows/docs.yml@v1 with: - packagename: ApodiniObservePrometheus \ No newline at end of file + packagename: ApodiniObservePrometheus diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 618b014..481bc51 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -16,6 +16,6 @@ on: jobs: spm_update: name: Swift Package Update - uses: Apodini/.github/.github/workflows/spm-update.yml@main + uses: Apodini/.github/.github/workflows/spm-update.yml@v1 secrets: token: ${{ secrets.ACCESS_TOKEN }} diff --git a/Package.resolved b/Package.resolved index b0b7571..9bc50ea 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/Apodini/Apodini.git", "state": { "branch": null, - "revision": "b0d2936496168e2635122534451a8537b2679668", - "version": "0.6.2" + "revision": "9fba450e31d4f173f430e9e90994a366e8a3d974", + "version": "0.7.1" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/Apodini/ApodiniMigrator.git", "state": { "branch": null, - "revision": "c2bb44275a82ec61de70e114d07eafc803d73f41", - "version": "0.1.4" + "revision": "9863ba8296576753afbb453de091c7b0e40e3dc3", + "version": "0.2.1" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/Apodini/ApodiniTypeInformation.git", "state": { "branch": null, - "revision": "95109a6f3cf93a828d1b0adf2cdc299e31fe5e87", - "version": "0.2.1" + "revision": "b4e73a6f92bd0930c9f1f8a857504b85b943dd88", + "version": "0.3.0" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/swift-server/async-http-client.git", "state": { "branch": null, - "revision": "1081b0b0541f535ca088acdb56f5ca5598bc6247", - "version": "1.6.3" + "revision": "70826d038d5bdc3142a386b735792d87ef7a5dfc", + "version": "1.8.1" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/vapor/async-kit.git", "state": { "branch": null, - "revision": "3b1e7e9069a62295151c6c1609050cd38a0a7af5", - "version": "1.11.0" + "revision": "e2f741640364c1d271405da637029ea6a33f754e", + "version": "1.11.1" } }, { @@ -78,8 +78,8 @@ "repositoryURL": "https://github.com/vapor/fluent-kit.git", "state": { "branch": null, - "revision": "2f1af22f4d495bc6f35365e537c4bb5eb60c5f17", - "version": "1.18.0" + "revision": "d5273e8d050c51dd7e1d3a4dab08fe32ec9ffffa", + "version": "1.20.0" } }, { @@ -91,6 +91,15 @@ "version": "4.1.0" } }, + { + "package": "grpc-swift", + "repositoryURL": "https://github.com/grpc/grpc-swift.git", + "state": { + "branch": null, + "revision": "5cc08ebf77e68598bfe4c793927d0f2838598607", + "version": "1.6.1" + } + }, { "package": "jmespath.swift", "repositoryURL": "https://github.com/adam-fowler/jmespath.swift.git", @@ -127,6 +136,15 @@ "version": "2.4.0" } }, + { + "package": "opentelemetry-swift", + "repositoryURL": "https://github.com/slashmo/opentelemetry-swift.git", + "state": { + "branch": null, + "revision": "e4f825fc2c7475553075a3c93b5ddadb5d4f5ec9", + "version": "0.1.1" + } + }, { "package": "PathKit", "repositoryURL": "https://github.com/kylef/PathKit.git", @@ -159,8 +177,8 @@ "repositoryURL": "https://github.com/soto-project/soto.git", "state": { "branch": null, - "revision": "cd90cff19b892078c17baae08270707e3fc1590c", - "version": "5.11.0" + "revision": "b98994beabdced18cbedbe50e947e6f2c8e0d602", + "version": "5.12.1" } }, { @@ -168,8 +186,8 @@ "repositoryURL": "https://github.com/soto-project/soto-core.git", "state": { "branch": null, - "revision": "988f0d906f5c76cf93c88fa5820f7c72e4b8fd98", - "version": "5.8.0" + "revision": "a216ea49b9ff2480ccbc5880b1aa648032433798", + "version": "5.9.2" } }, { @@ -249,8 +267,35 @@ "repositoryURL": "https://github.com/apple/swift-crypto.git", "state": { "branch": null, - "revision": "9c53b7a758bb849a7df1bd2314395f5f0c14306f", - "version": "2.0.3" + "revision": "a8911e0fadc25aef1071d582355bd1037a176060", + "version": "2.0.4" + } + }, + { + "package": "swift-distributed-tracing", + "repositoryURL": "https://github.com/apple/swift-distributed-tracing.git", + "state": { + "branch": null, + "revision": "fce1f7c91ad5a733500ea1cdd7ccd7aed9130536", + "version": "0.1.4" + } + }, + { + "package": "swift-distributed-tracing-baggage", + "repositoryURL": "https://github.com/apple/swift-distributed-tracing-baggage.git", + "state": { + "branch": null, + "revision": "b68b3277985555995298426a35084b832dbc51ae", + "version": "0.1.1" + } + }, + { + "package": "swift-distributed-tracing-baggage-core", + "repositoryURL": "https://github.com/apple/swift-distributed-tracing-baggage-core.git", + "state": { + "branch": null, + "revision": "9a2884a37f39e08ebd225627c400feae9c6ea8df", + "version": "0.1.1" } }, { @@ -285,8 +330,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "6aa9347d9bc5bbfe6a84983aec955c17ffea96ef", - "version": "2.33.0" + "revision": "51c3fc2e4a0fcdf4a25089b288dd65b73df1b0ef", + "version": "2.37.0" } }, { @@ -312,8 +357,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", "state": { "branch": null, - "revision": "2b329e37e9dd34fb382655181a680261d58cbbf1", - "version": "2.17.1" + "revision": "52a486ff6de9bc3e26bf634c5413c41c5fa89ca5", + "version": "2.17.2" } }, { @@ -321,8 +366,17 @@ "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", "state": { "branch": null, - "revision": "e7f5278a26442dc46783ba7e063643d524e414a0", - "version": "1.11.3" + "revision": "8ab824b140d0ebcd87e9149266ddc353e3705a3e", + "version": "1.11.4" + } + }, + { + "package": "SwiftProtobuf", + "repositoryURL": "https://github.com/apple/swift-protobuf.git", + "state": { + "branch": null, + "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", + "version": "1.18.0" } }, { diff --git a/Package.swift b/Package.swift index 6ba3727..1c83a5d 100644 --- a/Package.swift +++ b/Package.swift @@ -14,13 +14,13 @@ import PackageDescription let package = Package( name: "ApodiniObservePrometheus", platforms: [ - .macOS(.v12) + .macOS(.v11) ], products: [ .library(name: "ApodiniObservePrometheus", targets: ["ApodiniObservePrometheus"]) ], dependencies: [ - .package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.6.1")), + .package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.7.1")), .package(url: "https://github.com/apple/swift-metrics.git", .upToNextMinor(from: "2.2.0")), .package(url: "https://github.com/MrLotU/SwiftPrometheus.git", from: "1.0.0-alpha") ],