From b23c499dc087b528977eff04dd058cbee53b7504 Mon Sep 17 00:00:00 2001 From: mustiikhalil <26250654+mustiikhalil@users.noreply.github.com> Date: Tue, 11 Oct 2022 20:44:43 +0200 Subject: [PATCH] chore: Update dependencies to work with xcode 14 (#86) Update swift-tools-support-core to use 0.2.7 Match linux swift version with xcode swift version Bump swift version in docker --- .github/workflows/ci.yaml | 2 +- Dockerfile | 4 +- Package.resolved | 109 +++++++++++++++++++++++++++----------- Package.swift | 11 ++-- 4 files changed, 85 insertions(+), 41 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f926823..4b1e6ff 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,7 +32,7 @@ jobs: linux: runs-on: ubuntu-latest container: - image: swift:5.3 + image: swift:5.5 steps: - name: Checkout uses: actions/checkout@v1 diff --git a/Dockerfile b/Dockerfile index eb47298..a3dd0b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # ================================ # Build image # ================================ -FROM swift:5.3-bionic as build +FROM swift:5.5-bionic as build WORKDIR /build # Install libraries needed @@ -24,7 +24,7 @@ RUN swift build --enable-test-discovery --product XCMetricsBackend -c release # ================================ # Run image # ================================ -FROM swift:5.3-bionic-slim +FROM swift:5.5-bionic-slim # Create a vapor user and group with /app as its home directory RUN useradd --user-group --create-home --home-dir /app vapor diff --git a/Package.resolved b/Package.resolved index 0b07617..ac20012 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/swift-server/async-http-client.git", "state": { "branch": null, - "revision": "70826d038d5bdc3142a386b735792d87ef7a5dfc", - "version": "1.8.1" + "revision": "fc510a39cff61b849bf5cdff17eb2bd6d0777b49", + "version": "1.11.5" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/vapor/async-kit.git", "state": { "branch": null, - "revision": "7457413e57dbfac762b32dd30c1caf2c55a02a3d", - "version": "1.2.0" + "revision": "c3329e444bafbb12d1d312af9191be95348a8175", + "version": "1.13.0" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/vapor/fluent.git", "state": { "branch": null, - "revision": "e681c93df3201a2d8ceef15e8a9a0634578df233", - "version": "4.0.0" + "revision": "26c446002f03c5ab34b20d86873014ef3d92d0da", + "version": "4.5.0" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/vapor/fluent-kit.git", "state": { "branch": null, - "revision": "ef2a9a76c48856f0388ee2026d67d2ebde8c571c", - "version": "1.7.3" + "revision": "38670d2eefcba27530272946d627ac8d4e45f017", + "version": "1.35.1" } }, { @@ -69,8 +69,8 @@ "repositoryURL": "https://github.com/vapor/fluent-postgres-driver.git", "state": { "branch": null, - "revision": "f310f8843fafa3134cf89d81b8b3480f16967f37", - "version": "2.1.0" + "revision": "a8b2839ea86c44a35c17f66eb0885f9e5b51a531", + "version": "2.4.0" } }, { @@ -168,8 +168,8 @@ "repositoryURL": "https://github.com/vapor/postgres-kit.git", "state": { "branch": null, - "revision": "cbbe3ef8a0a8800301b8b76ab0f09dfc9e7306a2", - "version": "2.2.0" + "revision": "e97975309073e05d408749ccc1356076e4fdc22a", + "version": "2.8.2" } }, { @@ -177,8 +177,8 @@ "repositoryURL": "https://github.com/vapor/postgres-nio.git", "state": { "branch": null, - "revision": "3cf24967e54e3e63809593273b45b4e8135da6aa", - "version": "1.4.0" + "revision": "d648c5b4594ffbc2f6173318f70f5531e05ccb4e", + "version": "1.11.0" } }, { @@ -231,8 +231,8 @@ "repositoryURL": "https://github.com/vapor/routing-kit.git", "state": { "branch": null, - "revision": "4cf052b78aebaf1b23f2264ce04d57b4b6eb5254", - "version": "4.2.0" + "revision": "ffac7b3a127ce1e85fb232f1a6271164628809ad", + "version": "4.6.0" } }, { @@ -258,8 +258,17 @@ "repositoryURL": "https://github.com/vapor/sql-kit.git", "state": { "branch": null, - "revision": "ea9928b7f4a801b175a00b982034d9c54ecb6167", - "version": "3.7.0" + "revision": "3c5413a229bc2abc962dab17ea66d25e448ad344", + "version": "3.21.0" + } + }, + { + "package": "swift-algorithms", + "repositoryURL": "https://github.com/apple/swift-algorithms.git", + "state": { + "branch": null, + "revision": "b14b7f4c528c942f121c8b860b9410b2bf57825e", + "version": "1.0.0" } }, { @@ -271,6 +280,15 @@ "version": "0.3.1" } }, + { + "package": "swift-atomics", + "repositoryURL": "https://github.com/apple/swift-atomics.git", + "state": { + "branch": null, + "revision": "919eb1d83e02121cdb434c7bfc1f0c66ef17febe", + "version": "1.0.2" + } + }, { "package": "swift-backtrace", "repositoryURL": "https://github.com/swift-server/swift-backtrace.git", @@ -280,6 +298,15 @@ "version": "1.2.0" } }, + { + "package": "swift-collections", + "repositoryURL": "https://github.com/apple/swift-collections.git", + "state": { + "branch": null, + "revision": "f504716c27d2e5d4144fa4794b12129301d17729", + "version": "1.0.3" + } + }, { "package": "swift-crypto", "repositoryURL": "https://github.com/apple/swift-crypto.git", @@ -294,8 +321,8 @@ "repositoryURL": "https://github.com/apple/swift-log.git", "state": { "branch": null, - "revision": "173f567a2dfec11d74588eea82cecea555bdc0bc", - "version": "1.4.0" + "revision": "6fe203dc33195667ce1759bf0182975e4653ba1c", + "version": "1.4.4" } }, { @@ -312,8 +339,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "37e7a33de45bac894c0b08b56a2f755ebe4884e6", - "version": "2.35.0" + "revision": "bc4c55b9f9584f09eb971d67d956e28d08caa9d0", + "version": "2.43.1" } }, { @@ -330,8 +357,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-http2.git", "state": { "branch": null, - "revision": "6e94a7be32891d1b303a3fcfde8b5bf64d162e74", - "version": "1.19.1" + "revision": "00576e6f1efa5c46dca2ca3081dc56dd233b402d", + "version": "1.23.0" } }, { @@ -348,8 +375,17 @@ "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", "state": { "branch": null, - "revision": "e7f5278a26442dc46783ba7e063643d524e414a0", - "version": "1.11.3" + "revision": "b6e37a0d442745760d6ed0195d8f283d3ce0414a", + "version": "1.14.1" + } + }, + { + "package": "swift-numerics", + "repositoryURL": "https://github.com/apple/swift-numerics", + "state": { + "branch": null, + "revision": "0a5bc04095a675662cf24757cc0640aa2204253b", + "version": "1.0.2" } }, { @@ -361,13 +397,22 @@ "version": "1.12.0" } }, + { + "package": "swift-system", + "repositoryURL": "https://github.com/apple/swift-system.git", + "state": { + "branch": null, + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + } + }, { "package": "swift-tools-support-core", "repositoryURL": "https://github.com/apple/swift-tools-support-core.git", "state": { "branch": null, - "revision": "3b6b97d612b56e25d80d0807f5bc38ea08b7bdf3", - "version": "0.2.3" + "revision": "4f07be3dc201f6e2ee85b6942d0c220a16926811", + "version": "0.2.7" } }, { @@ -375,8 +420,8 @@ "repositoryURL": "https://github.com/vapor/vapor.git", "state": { "branch": null, - "revision": "34bf1b303623de04801d2b9bef5b2ed48b3e9319", - "version": "4.54.0" + "revision": "dda0de537e7906414dccd551e77095be1e34e3da", + "version": "4.65.2" } }, { @@ -393,8 +438,8 @@ "repositoryURL": "https://github.com/spotify/xclogparser", "state": { "branch": null, - "revision": "083e1ac0e091ac0e9e7f2fa7f467ef98192da3e5", - "version": "0.2.33" + "revision": "dc6093f866f1d239e9bafbfb3e0ad0ca75ef30b5", + "version": "0.2.34" } }, { diff --git a/Package.swift b/Package.swift index 8475555..696606d 100644 --- a/Package.swift +++ b/Package.swift @@ -15,8 +15,8 @@ let package = Package( .library(name: "XCMetricsUtils", targets: ["XCMetricsUtils"]), ], dependencies: [ - .package(url: "https://github.com/spotify/xclogparser", from: "0.2.33"), - .package(url: "https://github.com/apple/swift-tools-support-core.git", .exact("0.2.3")), + .package(url: "https://github.com/spotify/xclogparser", from: "0.2.34"), + .package(url: "https://github.com/apple/swift-tools-support-core.git", .exact("0.2.7")), .package(url: "https://github.com/grpc/grpc-swift.git", .exact("1.0.0-alpha.9")), .package(url: "https://github.com/apple/swift-nio.git", from: "2.32.3"), .package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.15.0"), @@ -25,15 +25,14 @@ let package = Package( .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.3.0"), .package(url: "https://github.com/jpsim/Yams.git", from: "3.0.0"), .package(url: "https://github.com/apple/swift-argument-parser", from: "0.1.0"), - .package(url: "https://github.com/vapor/vapor.git", from: "4.48.7"), - .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0"), - .package(url: "https://github.com/vapor/fluent-postgres-driver.git", from: "2.1.0"), + .package(url: "https://github.com/vapor/vapor.git", from: "4.65.2"), + .package(url: "https://github.com/vapor/fluent.git", from: "4.5.0"), + .package(url: "https://github.com/vapor/fluent-postgres-driver.git", from: "2.4.0"), .package(url: "https://github.com/vapor/queues-redis-driver.git", from: "1.0.0"), .package(url: "https://github.com/vapor/queues.git", from: "1.5.1"), .package(url: "https://github.com/vapor/redis.git", from: "4.0.0"), .package(url: "https://github.com/vapor-community/google-cloud-kit.git", from: "1.0.0-rc.2"), .package(url: "https://github.com/soto-project/soto.git", from: "4.0.0"), - .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.8.1"), ], targets: [ .target(