From 2e799ac5b303d634bf5a27fdf14edb29259da1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 28 Jun 2021 18:25:42 +0200 Subject: [PATCH] Update all. - Kotlin: 1.5.20 - clikt: now 3.0.0 to 4.0.0 - kotest now 4.3.0 to 5.0.0 --- build.gradle.kts | 15 ++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cc8c9af..879e415 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ buildscript { extra.apply { - set("coroutinesVersion", "1.4.1") - set("kotlinVersion", "1.4.30") + set("coroutinesVersion", "1.5") + set("kotlinVersion", "1.5.20") } } @@ -11,7 +11,7 @@ plugins { } group = "de.pheerai" -version = "0.0.3-SNAPSHOT" +version = "0.0.4-SNAPSHOT" repositories { mavenCentral() @@ -27,6 +27,7 @@ dependencies { api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:${getFromExtra("coroutinesVersion")}")) api("org.jetbrains.kotlinx", "kotlinx-coroutines-core") + api("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm") api("com.github.ajalt.clikt", "clikt") { version { cliktConstraints() } @@ -72,8 +73,8 @@ inline fun getFromProperties(name: String): T = project.properties[n inline fun getFromExtra(name: String): T = extra[name] as T fun MutableVersionConstraint.kotestConstraints() { - prefer("4.3.1") - strictly("[4.3.0,4.4.0[") + prefer("4.6.0") + strictly("[4.3.0,5.0.0[") } fun MutableVersionConstraint.kotlinxHtmlConstraints() { @@ -87,6 +88,6 @@ fun MutableVersionConstraint.jsoupConstraints() { } fun MutableVersionConstraint.cliktConstraints() { - prefer("3.0.1") - strictly("[3.0.0,3.1.0[") + prefer("3.2.0") + strictly("[3.0.0,4.0.0[") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a56324..69a9715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists