Upgrade swift/vapor to swift 5.2 (#5571)

* upgrade swift/vapor to swift 5.2

* use @ID(custom:)

frameworks/Swift/vapor/app/Package.swift

@@ -10,9 +10,9 @@ let package = Package(
         .executable(name: "app", targets: ["App"])
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-beta"),
-        .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0-beta"),
-        .package(url: "https://github.com/vapor/fluent-postgres-driver.git", from: "2.0.0-beta"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-rc"),
+        .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0-rc"),
+        .package(url: "https://github.com/vapor/fluent-postgres-driver.git", from: "2.0.0-rc"),
     ],
     targets: [
         .target(name: "App", dependencies: [

frameworks/Swift/vapor/app/Sources/World.swift

@@ -4,7 +4,7 @@ import Vapor
 final class World: Model, Content {
     static let schema = "World"
     
-    @ID(key: "id")
+    @ID(custom: "id")
     var id: Int32?
     
     @Field(key: "randomnumber")

frameworks/Swift/vapor/app/Sources/main.swift

@@ -31,14 +31,14 @@ app.get("json") { req in
 }
 
 app.get("db") { req in
-    World.find(.random(in: 1 ... 10_000), on: req.db)
+    World.find(.random(in: 1...10_000), on: req.db)
         .unwrap(or: Abort(.notFound))
 }
 
 app.get("queries") { req -> EventLoopFuture<[World]> in
     let queries = (req.query["queries"] ?? 1).bounded(to: 1...500)
     return (0 ..< queries).map { _ -> EventLoopFuture<World> in
-        World.find(.random(in: 1 ... 10_000), on: req.db)
+        World.find(.random(in: 1...10_000), on: req.db)
             .unwrap(or: Abort(.notFound))
     }.flatten(on: req.eventLoop)
 }

frameworks/Swift/vapor/vapor.dockerfile

@@ -1,7 +1,7 @@
 # ================================
 # Build image
 # ================================
-FROM vapor/swift:5.1 as build
+FROM vapor/swift:5.2 as build
 WORKDIR /build
 
 # Copy entire repo into container