From 96a84b227b1cbbe91a67bd1f0b2616da7e1a030a Mon Sep 17 00:00:00 2001
From: Michael Bull <mikebull94@gmail.com>
Date: Fri, 15 Apr 2022 15:16:40 +0100
Subject: [PATCH] Update dependencies

---
 buildSrc/src/main/kotlin/Versions.kt               | 10 +++++-----
 example/build.gradle.kts                           |  2 +-
 .../michaelbull/result/example/Application.kt      | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index b9876ac..a08cd49 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,9 +1,9 @@
 object Versions {
-    const val dokka = "1.6.10"
-    const val kotlin = "1.6.10"
-    const val kotlinBenchmark = "0.4.1"
-    const val kotlinCoroutines = "1.6.0"
-    const val ktor = "2.0.0-beta-1"
+    const val dokka = "1.6.20"
+    const val kotlin = "1.6.20"
+    const val kotlinBenchmark = "0.4.2"
+    const val kotlinCoroutines = "1.6.1"
+    const val ktor = "2.0.0"
     const val logback = "1.2.3"
     const val versionsPlugin = "0.41.0"
 }
diff --git a/example/build.gradle.kts b/example/build.gradle.kts
index 0666314..8f74302 100644
--- a/example/build.gradle.kts
+++ b/example/build.gradle.kts
@@ -13,9 +13,9 @@ dependencies {
     implementation(project(":kotlin-result"))
     implementation(kotlin("stdlib-jdk8"))
     implementation("ch.qos.logback:logback-classic:${Versions.logback}")
+    implementation("io.ktor:ktor-serialization-jackson:${Versions.ktor}")
     implementation("io.ktor:ktor-server-core:${Versions.ktor}")
     implementation("io.ktor:ktor-server-content-negotiation:${Versions.ktor}")
-    implementation("io.ktor:ktor-serialization-jackson:${Versions.ktor}")
     implementation("io.ktor:ktor-server-netty:${Versions.ktor}")
 }
 
diff --git a/example/src/main/kotlin/com/github/michaelbull/result/example/Application.kt b/example/src/main/kotlin/com/github/michaelbull/result/example/Application.kt
index 4aedc2a..1e325ad 100644
--- a/example/src/main/kotlin/com/github/michaelbull/result/example/Application.kt
+++ b/example/src/main/kotlin/com/github/michaelbull/result/example/Application.kt
@@ -37,7 +37,7 @@ import io.ktor.server.application.call
 import io.ktor.server.application.install
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
-import io.ktor.server.plugins.ContentNegotiation
+import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.receive
 import io.ktor.server.response.respond
 import io.ktor.server.routing.get
@@ -46,8 +46,8 @@ import io.ktor.server.routing.routing
 
 fun main() {
     embeddedServer(Netty, port = 8080, host = "0.0.0.0") {
-        configureRouting()
         configureSerialization()
+        configureRouting()
     }.start(wait = true)
 }
 
@@ -73,7 +73,8 @@ fun Application.configureRouting() {
 
     routing {
         get("/customers/{id}") {
-            val (status, message) = call.parameters.readId()
+            val (status, message) = call.parameters
+                .readId()
                 .andThen(customerService::getById)
                 .mapBoth(::customerToResponse, ::messageToResponse)
 
@@ -81,7 +82,8 @@ fun Application.configureRouting() {
         }
 
         post("/customers/{id}") {
-            val (status, message) = call.parameters.readId()
+            val (status, message) = call.parameters
+                .readId()
                 .andThen { customerService.save(it, call.receive()) }
                 .mapBoth(::eventToResponse, ::messageToResponse)
 
@@ -95,9 +97,7 @@ fun Application.configureRouting() {
 }
 
 private fun Parameters.readId(): Result<Long, DomainMessage> {
-    return get("id")
-        ?.toLongOrNull()
-        .toResultOr { CustomerRequired }
+    return get("id")?.toLongOrNull().toResultOr { CustomerRequired }
 }
 
 private fun customerToResponse(customer: CustomerDto) = HttpStatusCode.OK to customer