centralise versions in Gradle Version Catalog

buildSrc/build.gradle.kts

@@ -1,31 +1,17 @@
-import java.util.*
-
 plugins {
     `kotlin-dsl`
 }
 
-repositories {
-    gradlePluginPortal()
-}
-
-// TODO define versions in Gradle Version Catalog
-val properties = file("../gradle.properties").inputStream().use {
-    Properties().apply { load(it) }
-}
-
-val kotlinVersion = properties["kotlin_version"]
-
 dependencies {
     // Import Gradle Plugins that will be used in the buildSrc pre-compiled script plugins, and any `build.gradle.kts`
     // files in the project.
     // Use their Maven coordinates (plus versions), not Gradle plugin IDs!
     // This should be the only place that Gradle plugin versions are defined, so they are aligned across all build scripts
 
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-    implementation("com.github.jengelman.gradle.plugins:shadow:2.0.4")
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-    implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.12.1")
-    implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")
-    implementation("com.gradle.publish:plugin-publish-plugin:0.20.0")
+    implementation(libs.gradlePlugin.kotlin)
+    implementation(libs.gradlePlugin.shadow)
+    implementation(libs.gradlePlugin.binaryCompatibilityValidator)
+    implementation(libs.gradlePlugin.nexusPublish)
+    implementation(libs.gradlePlugin.dokka)
+    implementation(libs.gradlePlugin.gradlePluginPublish)
 }

buildSrc/settings.gradle.kts

@@ -1 +1,24 @@
 rootProject.name = "buildSrc"
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+@Suppress("UnstableApiUsage")
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

core/build.gradle.kts

@@ -7,24 +7,20 @@ plugins {
 }
 
 dependencies {
-    api("org.jetbrains:markdown:0.3.1")
+    api(libs.jetbrainsMarkdown)
     implementation(kotlin("reflect"))
 
-    val jsoup_version: String by project
-    implementation("org.jsoup:jsoup:$jsoup_version")
+    implementation(libs.jsoup)
 
-    val jackson_version: String by project
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version")
-    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version")
-    val jackson_databind_version: String by project
+    implementation(libs.jackson.kotlin)
+    implementation(libs.jackson.xml)
     constraints {
-        implementation("com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version") {
+        implementation(libs.jackson.databind) {
             because("CVE-2022-42003")
         }
     }
 
-    val coroutines_version: String by project
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
+    implementation(libs.kotlinxCoroutines.core)
 
     testImplementation(project(":core:test-api"))
     testImplementation(kotlin("test-junit"))

gradle.properties

@@ -1,19 +1,7 @@
 # Project Settings
 dokka_version=1.8.0-SNAPSHOT
 dokka_integration_test_parallelism=2
-# Versions
-kotlin_version=1.8.10
-coroutines_version=1.6.3
-kotlinx_html_version=0.7.5
-kotlin_plugin_version=213-1.8.10-release-430-IJ6777.52
-jsoup_version=1.15.3
-idea_version=213.6777.52
 language_version=1.4
-# jackson 2.13.X does not support kotlin language version 1.4, check before updating
-jackson_version=2.12.7
-# fixes CVE-2022-42003
-jackson_databind_version=2.12.7.1
-freemarker_version=2.3.31
 # Code style
 kotlin.code.style=official
 # Gradle settings

gradle/libs.versions.toml

@@ -0,0 +1,86 @@
+[versions]
+
+## compilation ##
+jvm = "11"
+kotlin = "1.8.10"
+kotlin-languageLevel = "1.4"
+
+
+## libs ##
+kotlin-plugin = "213-1.8.10-release-430-IJ6777.52"
+kotlinx-coroutines = "1.6.3"
+kotlinx-html = "0.7.5"
+jsoup = "1.15.3"
+idea = "213.6777.52"
+
+jackson = "2.12.7" # jackson 2.13.X does not support kotlin language version 1.4, check before updating
+jacksonDatabind = "2.12.7.1" # fixes CVE-2022-42003
+
+freemarker = "2.3.31"
+
+jetbrainsMarkdown = "0.3.1"
+
+## test ##
+junit = "5.9.2"
+
+## infra ##
+
+## gradle plugins ##
+gradlePlugin-shadow = "7.1.2"
+gradlePlugin-binaryCompatibilityValidator = "0.12.1"
+gradlePlugin-nexusPublish = "1.1.0"
+gradlePlugin-dokka = "1.7.10"
+gradlePlugin-gradlePluginPublish = "0.20.0"
+
+[libraries]
+#kotlin-compiler = { module = "", version.ref = "" }
+
+## kotlin ##
+kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
+
+kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref = "kotlin" }
+kotlin-idea = { module = "org.jetbrains.kotlin:idea", version.ref = "kotlin" }
+kotlin-common = { module = "org.jetbrains.kotlin:common", version.ref = "kotlin" }
+kotlin-core = { module = "org.jetbrains.kotlin:core", version.ref = "kotlin" }
+kotlin-native = { module = "org.jetbrains.kotlin:native", version.ref = "kotlin" }
+
+kotlinxCoroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "kotlinx-coroutines" }
+kotlinxCoroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+
+kotlinxHtml = { module = "org.jetbrains.kotlinx:kotlinx-html", version.ref = "kotlinx-html" }
+jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
+jetbrainsMarkdown = { module = "org.jetbrains:markdown", version.ref = "jetbrainsMarkdown" }
+freemarker = { module = "org.freemarker:freemarker", version.ref = "freemarker" }
+
+jetbrainsIntelliJ-core = { module = "com.jetbrains.intellij.idea:intellij-core", version.ref = "idea" }
+jetbrainsIntelliJ-jpsStandalone = { module = "com.jetbrains.intellij.idea:jps-standalone", version.ref = "idea" }
+
+## jackson ##
+jackson-bom = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
+jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
+jackson-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version.ref = "jackson" }
+
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jacksonDatabind" }
+
+## logging ##
+
+#############
+### test  ###
+#############
+
+## junit ##
+
+## junit ##
+junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
+junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter" }
+
+################
+### plugins  ###
+################
+
+gradlePlugin-binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "gradlePlugin-binaryCompatibilityValidator" }
+gradlePlugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradlePlugin-dokka" }
+gradlePlugin-gradlePluginPublish = { module = "com.gradle.publish:plugin-publish-plugin", version.ref = "gradlePlugin-gradlePluginPublish" }
+gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+gradlePlugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version.ref = "gradlePlugin-nexusPublish" }
+gradlePlugin-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "gradlePlugin-shadow" }

integration-tests/build.gradle.kts

@@ -6,8 +6,8 @@ dependencies {
     implementation(kotlin("stdlib"))
     api(project(":test-utils"))
     val coroutines_version: String by project
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
+    implementation(libs.kotlinxCoroutines.core)
     val jsoup_version: String by project
-    implementation("org.jsoup:jsoup:$jsoup_version")
+    implementation(libs.jsoup)
     implementation("org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r")
 }

integration-tests/gradle/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     implementation(gradleTestKit())
 
     val jsoup_version: String by project
-    implementation("org.jsoup:jsoup:$jsoup_version")
+    implementation(libs.jsoup)
 }
 
 tasks.integrationTest {

kotlin-analysis/compiler-dependency/build.gradle.kts

@@ -8,8 +8,7 @@ plugins {
 }
 
 dependencies {
-    val kotlin_version: String by project
-    api("org.jetbrains.kotlin:kotlin-compiler:$kotlin_version")
+    api(libs.kotlin.compiler)
 }
 
 tasks {

kotlin-analysis/intellij-dependency/build.gradle.kts

@@ -21,19 +21,19 @@ fun jpsModel() = zipTree(jpsStandalone.singleFile).matching {
 }
 
 dependencies {
-    val kotlin_plugin_version: String by project
+    val kotlin_plugin_version: String = libs.versions.kotlin.plugin.get()
+
     api("org.jetbrains.kotlin:common:$kotlin_plugin_version")
     api("org.jetbrains.kotlin:idea:$kotlin_plugin_version") {
         isTransitive = false
     }
     api("org.jetbrains.kotlin:core:$kotlin_plugin_version")
     api("org.jetbrains.kotlin:native:$kotlin_plugin_version")
 
-    val idea_version: String by project
-    intellijCore("com.jetbrains.intellij.idea:intellij-core:$idea_version")
+    intellijCore(libs.jetbrainsIntelliJ.core)
     implementation(intellijCoreAnalysis())
 
-    jpsStandalone("com.jetbrains.intellij.idea:jps-standalone:$idea_version")
+    jpsStandalone(libs.jetbrainsIntelliJ.jpsStandalone)
     implementation(jpsModel())
 }
 

plugins/all-modules-page/build.gradle.kts

@@ -24,23 +24,18 @@ dependencies {
     testImplementation(project(":plugins:gfm:gfm-template-processing"))
     testImplementation(project(":core:content-matcher-test-utils"))
 
-    val coroutines_version: String by project
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
-    val jackson_version: String by project
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version")
-    val jackson_databind_version: String by project
+    implementation(libs.kotlinxCoroutines.core)
+    implementation(libs.jackson.kotlin)
     constraints {
-        implementation("com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version") {
+        implementation(libs.jackson.databind) {
             because("CVE-2022-42003")
         }
     }
-    val kotlinx_html_version: String by project
-    implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version")
-
-    val jsoup_version: String by project
-    implementation("org.jsoup:jsoup:$jsoup_version")
+    implementation(libs.kotlinxHtml)
+    implementation(libs.jsoup)
 
     testImplementation(project(":test-utils"))
     testImplementation(project(":core:test-api"))
-    testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
 }

plugins/android-documentation/build.gradle.kts

@@ -16,7 +16,8 @@ dependencies {
     testImplementation(project(":plugins:base:base-test-utils"))
     testImplementation(project(":test-utils"))
     testImplementation(project(":core:test-api"))
-    testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
 }
 
 registerDokkaArtifactPublication("androidDocumentationPlugin") {

plugins/base/base-test-utils/build.gradle.kts

@@ -14,12 +14,13 @@ dependencies {
     compileOnly(project(":plugins:base"))
     implementation(project(":core:test-api"))
     val jsoup_version: String by project
-    implementation("org.jsoup:jsoup:$jsoup_version")
+    implementation(libs.jsoup)
     implementation(kotlin("test-junit"))
 
     testImplementation(project(":test-utils"))
     testImplementation(project(":core:test-api"))
-    testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
 }
 
 registerDokkaArtifactPublication("dokkaBaseTestUtils") {

plugins/base/build.gradle.kts

@@ -11,35 +11,31 @@ dependencies {
     implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 
-    val coroutines_version: String by project
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
+    implementation(libs.kotlinxCoroutines.core)
 
     compileOnly(project(":kotlin-analysis"))
-    val jsoup_version: String by project
-    implementation("org.jsoup:jsoup:$jsoup_version")
+    implementation(libs.jsoup)
 
-    val jackson_version: String by project
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version")
+    implementation(libs.jackson.kotlin)
     val jackson_databind_version: String by project
     constraints {
-        implementation("com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version") {
+        implementation(libs.jackson.databind) {
             because("CVE-2022-42003")
         }
     }
 
-    val freemarker_version: String by project
-    implementation("org.freemarker:freemarker:$freemarker_version")
+    implementation(libs.freemarker)
 
     testImplementation(project(":plugins:base:base-test-utils"))
     testImplementation(project(":core:content-matcher-test-utils"))
 
-    val kotlinx_html_version: String by project
-    implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version")
+    implementation(libs.kotlinxHtml)
 
     testImplementation(project(":kotlin-analysis"))
     testImplementation(project(":test-utils"))
     testImplementation(project(":core:test-api"))
-    testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
 }
 
 val projectDistDir = project(":plugins:base:frontend").file("dist")

plugins/gfm/build.gradle.kts

@@ -13,15 +13,14 @@ dependencies {
     implementation(project(":plugins:base"))
     testImplementation(project(":plugins:base"))
     testImplementation(project(":plugins:base:base-test-utils"))
-    val jackson_version: String by project
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version")
+    implementation(libs.jackson.kotlin)
     testImplementation(project(":test-utils"))
     testImplementation(project(":core:test-api"))
-    testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
 
-    val jackson_databind_version: String by project
     constraints {
-        implementation("com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version") {
+        implementation(libs.jackson.databind) {
             because("CVE-2022-42003")
         }
     }

plugins/gfm/gfm-template-processing/build.gradle.kts

@@ -15,12 +15,12 @@ dependencies {
     implementation(project(":plugins:all-modules-page"))
     implementation(project(":plugins:templating"))
 
-    val coroutines_version: String by project
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
+    implementation(libs.kotlinxCoroutines.core)
 
     testImplementation(project(":test-utils"))
     testImplementation(project(":core:test-api"))
-    testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
 }
 
 registerDokkaArtifactPublication("dokkaGfmTemplateProcessing") {