From e16ae4334e934c4eb159dfbbdfc4db7ccc92626a Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Thu, 3 Mar 2022 08:17:02 +0100 Subject: [PATCH] Switch to Gradle 7.4 version catalog syntax --- settings.gradle.kts | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 76dd78e..a69f5a4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,33 +13,38 @@ dependencyResolutionManagement { version("orx", if (orxUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0-rc.7") version("orml", if (ormlUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0") - alias("kotlin-jvm").toPluginId("org.jetbrains.kotlin.jvm").version("1.6.10") - alias("shadow").toPluginId("com.github.johnrengelman.shadow").version("7.1.0") - alias("runtime").toPluginId("org.beryx.runtime").version("1.12.7") - alias("gitarchive-tomarkdown").toPluginId("org.openrndr.extra.gitarchiver.tomarkdown").versionRef("orx") + plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").version("1.6.10") + plugin("shadow", "com.github.johnrengelman.shadow").version("7.1.0") + plugin("runtime", "org.beryx.runtime").version("1.12.7") - alias("kotlin-script-runtime").to("org.jetbrains.kotlin", "kotlin-script-runtime").versionRef("kotlin") + plugin("gitarchive-tomarkdown", "org.openrndr.extra.gitarchiver.tomarkdown").versionRef("orx") + + library("kotlin-script-runtime", "org.jetbrains.kotlin", "kotlin-script-runtime").versionRef("kotlin") version("slf4j", "1.7.32") - alias("slf4j-nop").to("org.sl4j","slf4j-nop").versionRef("slf4j") - alias("slf4j-simple").to("org.sl4j","slf4j-simple").versionRef("slf4j") + library("slf4j-nop", "org.sl4j", "slf4j-nop").versionRef("slf4j") + library("slf4j-simple", "org.sl4j", "slf4j-simple").versionRef("slf4j") version("jackson", "2.11.1") - alias("jackson-databind").to("com.fasterxml.jackson.core", "jackson-databind").versionRef("jackson") - alias("jackson-json").to("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml").versionRef("jackson") + library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").versionRef("jackson") + library("jackson-json", "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml").versionRef("jackson") version("log4j", "2.17.2") - alias("log4j-slf4j").to("org.apache.logging.log4j", "log4j-slf4j-impl").versionRef("log4j") + library("log4j-slf4j", "org.apache.logging.log4j", "log4j-slf4j-impl").versionRef("log4j") version("kotlinx-coroutines", "1.6.0") - alias("kotlinx-coroutines-core").to("org.jetbrains.kotlinx", "kotlinx-coroutines-core").versionRef("kotlinx-coroutines") - - alias("kotlin-logging").to("io.github.microutils:kotlin-logging-jvm:2.1.21") - alias("junit").to("junit:junit:4.13.2") - - alias("jsoup").to("org.jsoup:jsoup:1.14.3") - alias("gson").to("com.google.code.gson:gson:2.9.0") - alias("csv").to("com.github.doyaaaaaken:kotlin-csv-jvm:1.2.0") + library( + "kotlinx-coroutines-core", + "org.jetbrains.kotlinx", + "kotlinx-coroutines-core" + ).versionRef("kotlinx-coroutines") + + library("kotlin-logging", "io.github.microutils:kotlin-logging-jvm:2.1.21") + library("junit", "junit:junit:4.13.2") + + library("jsoup", "org.jsoup:jsoup:1.14.3") + library("gson", "com.google.code.gson:gson:2.9.0") + library("csv", "com.github.doyaaaaaken:kotlin-csv-jvm:1.2.0") } } }