From fab7125f4dcdd8cc32420dcba66f8ee302cbdda5 Mon Sep 17 00:00:00 2001 From: Chuckame Date: Thu, 12 Sep 2024 15:24:00 +0200 Subject: [PATCH] chore: move version catalog to standard toml file --- benchmark/build.gradle.kts | 4 ++++ build.gradle.kts | 4 ++++ gradle/libs.versions.toml | 26 ++++++++++++++++++++++++++ settings.gradle.kts | 34 ---------------------------------- 4 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index 5a4e71fb..d6319cc2 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -41,4 +41,8 @@ dependencies { implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-avro:$jacksonVersion") implementation(project(":")) +} + +repositories { + mavenCentral() } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index acd44abe..c05db046 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -159,4 +159,8 @@ spotless { kotlinGradle { ktlint() } +} + +repositories { + mavenCentral() } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..04e546d9 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,26 @@ +[versions] +kotlin = "2.0.0" +jvm = "21" +kotlinxSerialization = "1.7.0" +kotestVersion = "5.9.1" +okio = "3.9.0" +apache-avro = "1.11.3" + +[libraries] +apache-avro = { group = "org.apache.avro", name = "avro", version.ref = "apache-avro" } +okio = { group = "com.squareup.okio", name = "okio", version.ref = "okio" } +kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerialization" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } +kotest-core = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotestVersion" } +kotest-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotestVersion" } +kotest-junit5 = { group = "io.kotest", name = "kotest-runner-junit5", version.ref = "kotestVersion" } +kotest-property = { group = "io.kotest", name = "kotest-property", version.ref = "kotestVersion" } + +[plugins] +dokka = { id = "org.jetbrains.dokka", version = "1.9.20" } +kotest = { id = "io.kotest", version = "0.4.11" } +github-versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } +nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" } +spotless = { id = "com.diffplug.spotless", version = "6.25.0" } +kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.1" } +binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.14.0" } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index b73d99e2..bf1aea7b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,38 +21,4 @@ gradleEnterprise { termsOfServiceAgree = "yes" } } -} - -dependencyResolutionManagement { - versionCatalogs { - create("libs") { - version("kotlin", "2.0.0") - version("jvm", "21") - - library("apache-avro", "org.apache.avro", "avro").version("1.11.3") - library("okio", "com.squareup.okio", "okio").version("3.9.0") - - val kotlinxSerialization = "1.7.0" - library("kotlinx-serialization-core", "org.jetbrains.kotlinx", "kotlinx-serialization-core").version(kotlinxSerialization) - library("kotlinx-serialization-json", "org.jetbrains.kotlinx", "kotlinx-serialization-json").version(kotlinxSerialization) - - val kotestVersion = "5.9.1" - library("kotest-core", "io.kotest", "kotest-assertions-core").version(kotestVersion) - library("kotest-json", "io.kotest", "kotest-assertions-json").version(kotestVersion) - library("kotest-junit5", "io.kotest", "kotest-runner-junit5").version(kotestVersion) - library("kotest-property", "io.kotest", "kotest-property").version(kotestVersion) - - plugin("dokka", "org.jetbrains.dokka").version("1.9.20") - plugin("kotest", "io.kotest").version("0.4.11") - plugin("github-versions", "com.github.ben-manes.versions").version("0.51.0") - plugin("nexus-publish", "io.github.gradle-nexus.publish-plugin").version("2.0.0") - plugin("spotless", "com.diffplug.spotless").version("6.25.0") - plugin("kover", "org.jetbrains.kotlinx.kover").version("0.8.1") - plugin("binary-compatibility-validator", "org.jetbrains.kotlinx.binary-compatibility-validator").version("0.14.0") - } - } - @Suppress("UnstableApiUsage") - repositories { - mavenCentral() - } } \ No newline at end of file