From 183ea9a234daaff251096d1d42906131693a3ce9 Mon Sep 17 00:00:00 2001 From: Michael Bull Date: Thu, 30 May 2019 13:07:51 +0100 Subject: [PATCH] Update dependencies --- build.gradle.kts | 12 +++++------- example/build.gradle.kts | 8 +------- .../github/michaelbull/result/example/Application.kt | 2 -- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3c0b5ef..3f9a825 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,21 +1,19 @@ import com.jfrog.bintray.gradle.BintrayExtension import com.jfrog.bintray.gradle.tasks.BintrayUploadTask -import groovy.lang.Closure -import org.gradle.api.internal.HasConvention -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile description = "A Result monad for modelling success or failure operations." plugins { `maven-publish` - kotlin("jvm") version ("1.3.0") - id("org.jetbrains.dokka") version ("0.9.17") - id("com.github.ben-manes.versions") version ("0.20.0") + kotlin("jvm") version ("1.3.31") + id("org.jetbrains.dokka") version ("0.9.18") + id("com.github.ben-manes.versions") version ("0.21.0") id("com.jfrog.bintray") version ("1.8.4") - id("net.researchgate.release") version ("2.7.0") + id("net.researchgate.release") version ("2.8.0") } allprojects { diff --git a/example/build.gradle.kts b/example/build.gradle.kts index b17a59a..65a25a6 100644 --- a/example/build.gradle.kts +++ b/example/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.Coroutines - plugins { application kotlin("jvm") @@ -15,7 +13,7 @@ repositories { } dependencies { - val ktorVersion = "1.0.0-beta-3" + val ktorVersion = "1.2.1" implementation(project(":")) implementation(kotlin("stdlib-jdk8")) @@ -24,7 +22,3 @@ dependencies { implementation("io.ktor:ktor-server-netty:${ktorVersion}") implementation("io.ktor:ktor-gson:${ktorVersion}") } - -kotlin { - experimental.coroutines = Coroutines.ENABLE -} 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 e472946..fd70dea 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 @@ -27,7 +27,6 @@ import com.github.michaelbull.result.mapBoth import com.github.michaelbull.result.mapError import com.github.michaelbull.result.toResultOr import io.ktor.application.Application -import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.application.install import io.ktor.features.CallLogging @@ -53,7 +52,6 @@ fun Application.main() { } } - routing { get("/customers/{id}") { call.parameters.readId()