From 8edf611381993229e4eeca960afba3629f0158b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Sun, 10 Oct 2021 12:55:53 +0200 Subject: [PATCH] update dependencies --- build.gradle.kts | 23 ++++++++--------------- gradle.properties | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index eb3cfaa..47d9bbd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,5 @@ -buildscript { - extra.apply { - set("coroutinesVersion", "1.5.0") - set("kotlinVersion", "1.5.20") - } -} +val coroutinesVersion: String by project +val kotlinVersion: String by project plugins { `java-platform` @@ -11,7 +7,7 @@ plugins { } group = "de.pheerai" -version = "0.0.6-SNAPSHOT" +version = "0.0.7-SNAPSHOT" repositories { mavenCentral() @@ -23,8 +19,8 @@ javaPlatform { } dependencies { - api(platform("org.jetbrains.kotlin:kotlin-bom:${getFromExtra("kotlinVersion")}")) - api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:${getFromExtra("coroutinesVersion")}")) + api(platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion")) + api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:$coroutinesVersion")) api("org.jetbrains.kotlinx", "kotlinx-coroutines-core") api("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm") @@ -69,11 +65,8 @@ publishing { } } -inline fun getFromProperties(name: String): T = project.properties[name] as T -inline fun getFromExtra(name: String): T = extra[name] as T - fun MutableVersionConstraint.kotestConstraints() { - prefer("4.6.0") + prefer("4.6.3") strictly("[4.3.0,5.0.0[") } @@ -83,8 +76,8 @@ fun MutableVersionConstraint.kotlinxHtmlConstraints() { } fun MutableVersionConstraint.jsoupConstraints() { - prefer("1.13.1") - strictly("[1.13.0,1.14.0[") + prefer("1.14.3") + strictly("[1.14.0,1.15.0[") } fun MutableVersionConstraint.cliktConstraints() { diff --git a/gradle.properties b/gradle.properties index 29e08e8..8e11bb4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,4 @@ -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official + +coroutinesVersion=1.5.2 +kotlinVersion=1.5.31 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a9715..ffed3a2 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-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists