From 0afb6e0beb8931551c51a0ebccab1a9970a8f390 Mon Sep 17 00:00:00 2001 From: Will McGinty Date: Thu, 28 Mar 2024 20:14:36 -0500 Subject: [PATCH] Update packages, Xcode --- .../xcshareddata/swiftpm/Package.resolved | 537 +++++++++--------- Auth/Auth.xcodeproj/project.pbxproj | 12 +- .../xcschemes/BackendAppTests.xcscheme | 2 +- Backend/Package.resolved | 521 +++++++++-------- Backend/Package.swift | 8 +- Backend/Sources/BackendApp/configure.swift | 2 +- 6 files changed, 569 insertions(+), 513 deletions(-) diff --git a/Auth.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Auth.xcworkspace/xcshareddata/swiftpm/Package.resolved index ad90f99..2933607 100644 --- a/Auth.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Auth.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,259 +1,284 @@ { - "object": { - "pins": [ - { - "package": "async-http-client", - "repositoryURL": "https://github.com/swift-server/async-http-client.git", - "state": { - "branch": null, - "revision": "03b3e7b34153299e9b4c4b5c2a6ac790a582a3ac", - "version": "1.12.0" - } - }, - { - "package": "async-kit", - "repositoryURL": "https://github.com/vapor/async-kit.git", - "state": { - "branch": null, - "revision": "c3329e444bafbb12d1d312af9191be95348a8175", - "version": "1.13.0" - } - }, - { - "package": "console-kit", - "repositoryURL": "https://github.com/vapor/console-kit.git", - "state": { - "branch": null, - "revision": "a7e67a1719933318b5ab7eaaed355cde020465b1", - "version": "4.5.0" - } - }, - { - "package": "fluent", - "repositoryURL": "https://github.com/vapor/fluent.git", - "state": { - "branch": null, - "revision": "26c446002f03c5ab34b20d86873014ef3d92d0da", - "version": "4.5.0" - } - }, - { - "package": "fluent-kit", - "repositoryURL": "https://github.com/vapor/fluent-kit.git", - "state": { - "branch": null, - "revision": "38670d2eefcba27530272946d627ac8d4e45f017", - "version": "1.35.1" - } - }, - { - "package": "fluent-postgres-driver", - "repositoryURL": "https://github.com/vapor/fluent-postgres-driver.git", - "state": { - "branch": null, - "revision": "a8b2839ea86c44a35c17f66eb0885f9e5b51a531", - "version": "2.4.0" - } - }, - { - "package": "Hyperspace", - "repositoryURL": "https://github.com/BottleRocketStudios/iOS-Hyperspace", - "state": { - "branch": "feature/async", - "revision": "1478826404a6802df0d474f8398e5e3b1998f8c3", - "version": null - } - }, - { - "package": "jwt-kit", - "repositoryURL": "https://github.com/vapor/jwt-kit", - "state": { - "branch": null, - "revision": "87ce13a1df913ba4d51cf00606df7ef24d455571", - "version": "4.7.0" - } - }, - { - "package": "multipart-kit", - "repositoryURL": "https://github.com/vapor/multipart-kit.git", - "state": { - "branch": null, - "revision": "0d55c35e788451ee27222783c7d363cb88092fab", - "version": "4.5.2" - } - }, - { - "package": "postgres-kit", - "repositoryURL": "https://github.com/vapor/postgres-kit.git", - "state": { - "branch": null, - "revision": "e97975309073e05d408749ccc1356076e4fdc22a", - "version": "2.8.2" - } - }, - { - "package": "postgres-nio", - "repositoryURL": "https://github.com/vapor/postgres-nio.git", - "state": { - "branch": null, - "revision": "382b0e10c077bd579d85934b255b33b7dd0220f0", - "version": "1.11.1" - } - }, - { - "package": "routing-kit", - "repositoryURL": "https://github.com/vapor/routing-kit.git", - "state": { - "branch": null, - "revision": "ffac7b3a127ce1e85fb232f1a6271164628809ad", - "version": "4.6.0" - } - }, - { - "package": "sql-kit", - "repositoryURL": "https://github.com/vapor/sql-kit.git", - "state": { - "branch": null, - "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" - } - }, - { - "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", - "state": { - "branch": null, - "revision": "f25620d5d05e2f1ba27154b40cafea2b67566956", - "version": "1.3.3" - } - }, - { - "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", - "state": { - "branch": null, - "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", - "version": "1.1.7" - } - }, - { - "package": "swift-log", - "repositoryURL": "https://github.com/apple/swift-log.git", - "state": { - "branch": null, - "revision": "6fe203dc33195667ce1759bf0182975e4653ba1c", - "version": "1.4.4" - } - }, - { - "package": "swift-metrics", - "repositoryURL": "https://github.com/apple/swift-metrics.git", - "state": { - "branch": null, - "revision": "53be78637ecd165d1ddedc4e20de69b8f43ec3b7", - "version": "2.3.2" - } - }, - { - "package": "swift-nio", - "repositoryURL": "https://github.com/apple/swift-nio.git", - "state": { - "branch": null, - "revision": "a16e2f54a25b2af217044e5168997009a505930f", - "version": "2.42.0" - } - }, - { - "package": "swift-nio-extras", - "repositoryURL": "https://github.com/apple/swift-nio-extras.git", - "state": { - "branch": null, - "revision": "6c84d247754ad77487a6f0694273b89b83efd056", - "version": "1.14.0" - } - }, - { - "package": "swift-nio-http2", - "repositoryURL": "https://github.com/apple/swift-nio-http2.git", - "state": { - "branch": null, - "revision": "00576e6f1efa5c46dca2ca3081dc56dd233b402d", - "version": "1.23.0" - } - }, - { - "package": "swift-nio-ssl", - "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", - "state": { - "branch": null, - "revision": "ba7c0d7f82affc518147ea61d240330bf7f7ea9b", - "version": "2.22.1" - } - }, - { - "package": "swift-nio-transport-services", - "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", - "state": { - "branch": null, - "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" - } - }, - { - "package": "vapor", - "repositoryURL": "https://github.com/vapor/vapor.git", - "state": { - "branch": null, - "revision": "dda0de537e7906414dccd551e77095be1e34e3da", - "version": "4.65.2" - } - }, - { - "package": "websocket-kit", - "repositoryURL": "https://github.com/vapor/websocket-kit.git", - "state": { - "branch": null, - "revision": "2d9d2188a08eef4a869d368daab21b3c08510991", - "version": "2.6.1" - } + "pins" : [ + { + "identity" : "async-http-client", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swift-server/async-http-client.git", + "state" : { + "revision" : "291438696abdd48d2a83b52465c176efbd94512b", + "version" : "1.20.1" } - ] - }, - "version": 1 + }, + { + "identity" : "async-kit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/async-kit.git", + "state" : { + "revision" : "7ece208cd401687641c88367a00e3ea2b04311f1", + "version" : "1.19.0" + } + }, + { + "identity" : "console-kit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/console-kit.git", + "state" : { + "revision" : "a31f44ebfbd15a2cc0fda705279676773ac16355", + "version" : "4.14.1" + } + }, + { + "identity" : "fluent", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/fluent.git", + "state" : { + "revision" : "a586a5d4164f23a0ee4e02e1f467b9bbef0c9f1c", + "version" : "4.9.0" + } + }, + { + "identity" : "fluent-kit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/fluent-kit.git", + "state" : { + "revision" : "5f0938a3f5f1a751ff7a411117bfce4efe713526", + "version" : "1.47.2" + } + }, + { + "identity" : "fluent-postgres-driver", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/fluent-postgres-driver.git", + "state" : { + "revision" : "a538fc647f82d915eb84e0a12ca9b08c513e57c4", + "version" : "2.8.0" + } + }, + { + "identity" : "ios-hyperspace", + "kind" : "remoteSourceControl", + "location" : "https://github.com/BottleRocketStudios/iOS-Hyperspace", + "state" : { + "revision" : "f3bed245fa59a7729c1e46eba67dac5dc059d13e", + "version" : "5.1.0" + } + }, + { + "identity" : "jwt-kit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/jwt-kit", + "state" : { + "revision" : "e05513b5aec24f88012b6e3034115b6bc915356a", + "version" : "4.13.2" + } + }, + { + "identity" : "multipart-kit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/multipart-kit.git", + "state" : { + "revision" : "12ee56f25bd3fc4c2d09c2aa16e69de61dc786e8", + "version" : "4.6.0" + } + }, + { + "identity" : "postgres-kit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/postgres-kit.git", + "state" : { + "revision" : "f6c1bff07bb2ceb72cd6f5c9f8725f493c3302d5", + "version" : "2.13.0" + } + }, + { + "identity" : "postgres-nio", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/postgres-nio.git", + "state" : { + "revision" : "e345cbb9cf6052b37b27c0c4f976134fc01dbe15", + "version" : "1.21.1" + } + }, + { + "identity" : "routing-kit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/routing-kit.git", + "state" : { + "revision" : "2a92a7eac411a82fb3a03731be5e76773ebe1b3e", + "version" : "4.9.0" + } + }, + { + "identity" : "sql-kit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/sql-kit.git", + "state" : { + "revision" : "b2f128cb62a3abfbb1e3b2893ff3ee69e70f4f0f", + "version" : "3.28.0" + } + }, + { + "identity" : "swift-algorithms", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-algorithms.git", + "state" : { + "revision" : "f6919dfc309e7f1b56224378b11e28bab5bccc42", + "version" : "1.2.0" + } + }, + { + "identity" : "swift-async-algorithms", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-async-algorithms.git", + "state" : { + "revision" : "da4e36f86544cdf733a40d59b3a2267e3a7bbf36", + "version" : "1.0.0" + } + }, + { + "identity" : "swift-atomics", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-atomics.git", + "state" : { + "revision" : "cd142fd2f64be2100422d658e7411e39489da985", + "version" : "1.2.0" + } + }, + { + "identity" : "swift-collections", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-collections.git", + "state" : { + "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb", + "version" : "1.1.0" + } + }, + { + "identity" : "swift-crypto", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-crypto.git", + "state" : { + "revision" : "f0525da24dc3c6cbb2b6b338b65042bc91cbc4bb", + "version" : "3.3.0" + } + }, + { + "identity" : "swift-http-types", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-http-types", + "state" : { + "revision" : "12358d55a3824bd5fed310b999ea8cf83a9a1a65", + "version" : "1.0.3" + } + }, + { + "identity" : "swift-log", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-log.git", + "state" : { + "revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5", + "version" : "1.5.4" + } + }, + { + "identity" : "swift-metrics", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-metrics.git", + "state" : { + "revision" : "971ba26378ab69c43737ee7ba967a896cb74c0d1", + "version" : "2.4.1" + } + }, + { + "identity" : "swift-nio", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-nio.git", + "state" : { + "revision" : "fc63f0cf4e55a4597407a9fc95b16a2bc44b4982", + "version" : "2.64.0" + } + }, + { + "identity" : "swift-nio-extras", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-nio-extras.git", + "state" : { + "revision" : "a3b640d7dc567225db7c94386a6e71aded1bfa63", + "version" : "1.22.0" + } + }, + { + "identity" : "swift-nio-http2", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-nio-http2.git", + "state" : { + "revision" : "0904bf0feb5122b7e5c3f15db7df0eabe623dd87", + "version" : "1.30.0" + } + }, + { + "identity" : "swift-nio-ssl", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-nio-ssl.git", + "state" : { + "revision" : "7c381eb6083542b124a6c18fae742f55001dc2b5", + "version" : "2.26.0" + } + }, + { + "identity" : "swift-nio-transport-services", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-nio-transport-services.git", + "state" : { + "revision" : "6cbe0ed2b394f21ab0d46b9f0c50c6be964968ce", + "version" : "1.20.1" + } + }, + { + "identity" : "swift-numerics", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-numerics", + "state" : { + "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b", + "version" : "1.0.2" + } + }, + { + "identity" : "swift-service-lifecycle", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swift-server/swift-service-lifecycle.git", + "state" : { + "revision" : "d7fe0e731499a8dcce53bf4cbbc812c8e565d3a7", + "version" : "2.4.1" + } + }, + { + "identity" : "swift-system", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-system.git", + "state" : { + "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496", + "version" : "1.2.1" + } + }, + { + "identity" : "vapor", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/vapor.git", + "state" : { + "revision" : "11cdb29614a5c7f8c5289f3c97b3398c3d89b395", + "version" : "4.92.5" + } + }, + { + "identity" : "websocket-kit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vapor/websocket-kit.git", + "state" : { + "revision" : "4232d34efa49f633ba61afde365d3896fc7f8740", + "version" : "2.15.0" + } + } + ], + "version" : 2 } diff --git a/Auth/Auth.xcodeproj/project.pbxproj b/Auth/Auth.xcodeproj/project.pbxproj index 8601f3b..6b483af 100644 --- a/Auth/Auth.xcodeproj/project.pbxproj +++ b/Auth/Auth.xcodeproj/project.pbxproj @@ -152,7 +152,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1400; - LastUpgradeCheck = 1400; + LastUpgradeCheck = 1510; TargetAttributes = { B4F9687828E68ED3008C5C30 = { CreatedOnToolsVersion = 14.0; @@ -246,9 +246,11 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -305,9 +307,11 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -332,6 +336,7 @@ CODE_SIGN_ENTITLEMENTS = Auth/Auth.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Auth/Preview Content\""; DEVELOPMENT_TEAM = 9W2C69WDZE; ENABLE_HARDENED_RUNTIME = YES; @@ -371,6 +376,7 @@ CODE_SIGN_ENTITLEMENTS = Auth/Auth.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Auth/Preview Content\""; DEVELOPMENT_TEAM = 9W2C69WDZE; ENABLE_HARDENED_RUNTIME = YES; @@ -430,8 +436,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/BottleRocketStudios/iOS-Hyperspace"; requirement = { - branch = feature/async; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 5.0.0; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Backend/.swiftpm/xcode/xcshareddata/xcschemes/BackendAppTests.xcscheme b/Backend/.swiftpm/xcode/xcshareddata/xcschemes/BackendAppTests.xcscheme index f665109..f55d2f8 100644 --- a/Backend/.swiftpm/xcode/xcshareddata/xcschemes/BackendAppTests.xcscheme +++ b/Backend/.swiftpm/xcode/xcshareddata/xcschemes/BackendAppTests.xcscheme @@ -1,6 +1,6 @@ DatabaseConfigurationFactory { - return DatabaseConfigurationFactory.postgres(hostname: "localhost", port: 5432, username: "postgres", password: "", database: "auth") + return .postgres(configuration: .init(hostname: "localhost", port: 5432, username: "postgres", password: "", database: "auth", tls: .disable), encodingContext: .default, decodingContext: .default) } }