Added versions catalog instead of storing version properties

Author: dkrasnoff

README.md

@@ -2,7 +2,7 @@
 
 [![official JetBrains project](https://jb.gg/badges/official-plastic.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 ![Build status](https://buildserver.labs.intellij.net/app/rest/builds/buildType:id:Kotlin_KotlinSites_Deployments_PlayKotlinlangOrg_Backend_BuildMaster/statusIcon.svg)
-![Java CI](https://github.com/AlexanderPrendota/kotlin-compiler-server/workflows/Java%20CI/badge.svg)
+![Java CI](https://github.com/JetBrains/kotlin-compiler-server/workflows/Java%20CI/badge.svg)
 ![TC status](https://img.shields.io/teamcity/build/s/Kotlin_KotlinPlayground_KotlinCompilerServer_Build?label=TeamCity%20build)
 [![Kotlin](https://img.shields.io/badge/Kotlin-1.7.20-orange.svg) ](https://kotlinlang.org/)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
@@ -57,7 +57,7 @@ Swagger url: http://localhost:8080/swagger-ui/
 ## How to add your dependencies to kotlin compiler :books:
 
 Just put whatever you need as dependencies
-to [build.gradle.kts](https://github.com/AlexanderPrendota/kotlin-compiler-server/blob/master/build.gradle.kts) via a
+to [build.gradle.kts](https://github.com/JetBrains/kotlin-compiler-server/blob/master/build.gradle.kts) via a
 task called `kotlinDependency`:
 
 ```
@@ -113,19 +113,19 @@ In case of an unsuccessful execution in the standard output will be the event wi
   "level_value": 20000,
   "hasErrors": true,
   "confType": "JAVA",
-  "kotlinVersion": "$koltinVersion"
+  "kotlinVersion": "$kotlinVersion"
 }
 ```
 
 ## Kotlin release guide :rocket:
 
 1) Update the kotlin version
-   in [gradle.properties](https://github.com/AlexanderPrendota/kotlin-compiler-server/blob/master/gradle.properties)
+   in [libs.versions.toml](https://github.com/JetBrains/kotlin-compiler-server/blob/master/gradle/libs.versions.toml)
 2) Make sure everything is going well via the task:
 
 ```shell script
 $ ./gradlew build
 ```
 
 3) Save branch with the name of the kotlin version. Pattern: `/^[0-9.]+$/`  (optional)
-4) Bump version on GitHub [releases](https://github.com/AlexanderPrendota/kotlin-compiler-server/releases) (optional)
+4) Bump version on GitHub [releases](https://github.com/JetBrains/kotlin-compiler-server/releases) (optional)

build.gradle.kts

@@ -7,16 +7,15 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
 val policy: String by System.getProperties()
 
 group = "com.compiler.server"
-version = "$kotlinVersion-SNAPSHOT"
+version = "${libs.versions.kotlin.get()}-SNAPSHOT"
 
 val propertyFile = "application.properties"
 
 plugins {
-    id("org.springframework.boot") version "2.7.10"
-    id("io.spring.dependency-management") version "1.1.3"
-    val kotlinVersion by System.getProperties()
-    kotlin("jvm") version "$kotlinVersion"
-    kotlin("plugin.spring") version "$kotlinVersion"
+    alias(libs.plugins.spring.dependency.management)
+    alias(libs.plugins.spring.boot)
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.kotlin.plugin.spring)
 }
 
 kotlin.jvmToolchain {
@@ -46,7 +45,7 @@ allprojects {
         dependencies {
             dependencies {
                 implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2")
-                implementation("org.jetbrains.kotlin:idea:231-$kotlinIdeVersion-$kotlinIdeVersionSuffix") {
+                implementation(libs.kotlin.idea) {
                     isTransitive = false
                 }
             }
@@ -63,31 +62,29 @@ dependencies {
     annotationProcessor("org.springframework:spring-context-indexer")
     implementation("com.google.code.gson:gson")
     implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("io.springfox:springfox-boot-starter:3.0.0")
-    implementation("com.amazonaws.serverless:aws-serverless-java-container-springboot2:1.9.3")
-    implementation("junit:junit:4.13.2")
-    implementation("net.logstash.logback:logstash-logback-encoder:7.3")
-    implementation("org.jetbrains.intellij.deps:trove4j:1.0.20221201")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-script-runtime:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-compiler-for-ide:$kotlinIdeVersion") {
+    implementation(libs.springfox.boot.starter)
+    implementation(libs.aws.springboot.container)
+    implementation(libs.junit)
+    implementation(libs.logback.logstash.encoder)
+    implementation(libs.intellij.trove4j)
+    implementation(libs.kotlin.reflect)
+    implementation(libs.bundles.kotlin.stdlib)
+    implementation(libs.kotlin.test)
+    implementation(libs.kotlin.compiler)
+    implementation(libs.kotlin.script.runtime)
+    implementation(libs.kotlin.compiler.ide) {
         isTransitive = false
     }
-    implementation("org.jetbrains.kotlin:core:231-$kotlinIdeVersion-$kotlinIdeVersionSuffix")
+    implementation(libs.kotlin.core)
     implementation(project(":executors", configuration = "default"))
     implementation(project(":common", configuration = "default"))
 
     testImplementation("org.springframework.boot:spring-boot-starter-test") {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
     }
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
+    testImplementation(libs.kotlinx.coroutines.test)
 
-    resourceDependency("org.jetbrains.skiko:skiko-js-wasm-runtime:0.7.90")
+    resourceDependency(libs.skiko.js.wasm.runtime)
 }
 
 fun buildPropertyFile() {
@@ -129,7 +126,7 @@ tasks.withType<KotlinCompile> {
     dependsOn(":indexation:run")
     buildPropertyFile()
 }
-println("Using Kotlin compiler $kotlinVersion")
+println("Using Kotlin compiler ${libs.versions.kotlin.get()}")
 
 tasks.withType<BootJar> {
     requiresUnpack("**/kotlin-*.jar")

buildSrc/build.gradle.kts

@@ -4,4 +4,9 @@ plugins {
 
 repositories {
     mavenCentral()
+}
+
+// workaround to pass libs into conventions (see https://github.com/gradle/gradle/issues/15383)
+dependencies {
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }

buildSrc/settings.gradle.kts

@@ -0,0 +1,13 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+        val kotlinVersion = providers.gradleProperty("kotlinVersion")
+        if (kotlinVersion.isPresent) {
+            create("libs") {
+                version("kotlin", kotlinVersion.get())
+            }
+        }
+    }
+}

buildSrc/src/main/kotlin/properties.kt

@@ -1,19 +1,27 @@
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.kotlin.dsl.the
 
-val kotlinVersion: String by System.getProperties()
-val kotlinIdeVersion: String by System.getProperties()
-val kotlinIdeVersionSuffix: String by System.getProperties()
 val indexes: String by System.getProperties()
 val indexesJs: String by System.getProperties()
 val indexesWasm: String by System.getProperties()
 val indexesComposeWasm: String by System.getProperties()
 
-val libJS = "$kotlinVersion-js"
-val libWasm = "$kotlinVersion-wasm"
-val libComposeWasm = "$kotlinVersion-compose-wasm"
-val libComposeWasmCompilerPlugins = "$kotlinVersion-compose-wasm-compiler-plugins"
-val libJVM = kotlinVersion
+// workaround to pass libs into conventions (see https://github.com/gradle/gradle/issues/15383)
+val Project.kotlinVersion
+    get() = the<LibrariesForLibs>().versions.kotlin.get()
+
+val Project.libJS
+    get() = "$kotlinVersion-js"
+val Project.libWasm
+    get() = "$kotlinVersion-wasm"
+val Project.libComposeWasm
+    get() = "$kotlinVersion-compose-wasm"
+val Project.libComposeWasmCompilerPlugins
+    get() = "$kotlinVersion-compose-wasm-compiler-plugins"
+val Project.libJVM
+    get() = kotlinVersion
 
 val Project.libJSFolder
     get() = rootProject.layout.projectDirectory.dir(libJS)

common/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-idea:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:base-fe10-analysis:231-$kotlinIdeVersion-$kotlinIdeVersionSuffix")
+    implementation(libs.kotlin.compiler)
+    implementation(libs.kotlin.gradle.plugin.idea)
+    implementation(libs.kotlin.base.fe10.analysis)
 }

dependencies/build.gradle.kts

@@ -58,9 +58,6 @@ val composeWasmCompilerPlugins: Configuration by configurations.creating {
     isTransitive = false
 }
 
-
-val jacksonVersionKotlinDependencyJar = "2.14.0" // don't forget to update version in `executor.policy` file.
-
 val composeRuntimeVersion = "1.6.0"
 
 val copyDependencies by tasks.creating(Copy::class) {
@@ -92,33 +89,23 @@ plugins {
 }
 
 dependencies {
-    kotlinDependency("junit:junit:4.13.2")
-    kotlinDependency("org.hamcrest:hamcrest:2.2")
-    kotlinDependency("com.fasterxml.jackson.core:jackson-databind:$jacksonVersionKotlinDependencyJar")
-    kotlinDependency("com.fasterxml.jackson.core:jackson-core:$jacksonVersionKotlinDependencyJar")
-    kotlinDependency("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersionKotlinDependencyJar")
+    kotlinDependency(libs.junit)
+    kotlinDependency(libs.hamcrest)
+    kotlinDependency(libs.bundles.jackson)
     // Kotlin libraries
-    kotlinDependency("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
-    kotlinDependency("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
-    kotlinDependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-    kotlinDependency("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
-    kotlinDependency("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3")
-    kotlinDependency("org.jetbrains.kotlinx:kotlinx-io-core:0.5.1")
-    kotlinDependency("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
-    kotlinDependency("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0-RC.2")
-    kotlinJsDependency("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion")
-    kotlinJsDependency("org.jetbrains.kotlin:kotlin-dom-api-compat:$kotlinVersion")
-    kotlinWasmDependency("org.jetbrains.kotlin:kotlin-stdlib-wasm-js:$kotlinVersion")
+    kotlinDependency(libs.bundles.kotlin.stdlib)
+    kotlinDependency(libs.kotlin.test)
+    kotlinDependency(libs.kotlinx.coroutines.core.jvm)
+    kotlinDependency(libs.kotlinx.coroutines.test)
+    kotlinDependency(libs.kotlinx.io.core)
+    kotlinDependency(libs.kotlinx.datetime)
+    kotlinJsDependency(libs.kotlin.stdlib.js)
+    kotlinJsDependency(libs.kotlin.dom.api.compat)
+    kotlinWasmDependency(libs.kotlin.stdlib.wasm.js)
 
     // compose
-    kotlinComposeWasmDependency("org.jetbrains.kotlin:kotlin-stdlib-wasm-js:$kotlinVersion")
-    kotlinComposeWasmDependency("org.jetbrains.compose.runtime:runtime:$composeRuntimeVersion")
-    kotlinComposeWasmDependency("org.jetbrains.compose.ui:ui:$composeRuntimeVersion")
-    kotlinComposeWasmDependency("org.jetbrains.compose.animation:animation:$composeRuntimeVersion")
-    kotlinComposeWasmDependency("org.jetbrains.compose.animation:animation-graphics:$composeRuntimeVersion")
-    kotlinComposeWasmDependency("org.jetbrains.compose.foundation:foundation:$composeRuntimeVersion")
-    kotlinComposeWasmDependency("org.jetbrains.compose.material:material:$composeRuntimeVersion")
-    kotlinComposeWasmDependency("org.jetbrains.compose.components:components-resources:$composeRuntimeVersion")
-
-    composeWasmCompilerPlugins("org.jetbrains.kotlin:kotlin-compose-compiler-plugin:$kotlinVersion")
+    kotlinComposeWasmDependency(libs.kotlin.stdlib.wasm.js)
+    kotlinComposeWasmDependency(libs.bundles.compose)
+
+    composeWasmCompilerPlugins(libs.kotlin.compose.compiler.plugin)
 }

executors/build.gradle.kts

@@ -8,7 +8,7 @@ kotlin.jvmToolchain {
 }
 
 dependencies {
-  implementation("junit:junit:4.13.2")
+  implementation(libs.junit)
 }
 
 tasks.withType<Jar>().getByName("jar") {

gradle.properties

@@ -1,6 +1,3 @@
-systemProp.kotlinVersion=2.0.20-RC
-systemProp.kotlinIdeVersion=1.9.20-506
-systemProp.kotlinIdeVersionSuffix=IJ8109.175
 systemProp.policy=executor.policy
 systemProp.indexes=indexes.json
 systemProp.indexesJs=indexesJs.json

gradle/libs.versions.toml

@@ -0,0 +1,71 @@
+[versions]
+kotlin = "2.0.20-RC"
+kotlinIdeVersion = "1.9.20-506"
+kotlinIdeVersionWithSuffix = "231-1.9.20-506-IJ8109.175"
+spring-boot = "2.7.10"
+spring-dependency-managment = "1.1.3"
+springfox-boot-starter = "3.0.0"
+aws-serverless-java-container-springboot2 = "1.9.3"
+junit = "4.13.2"
+logstash-logback-encoder = "7.3"
+trove4j = "1.0.20221201"
+kotlinx-coroutines = "1.7.3"
+kotlinx-coroutines-test = "1.6.4"
+skiko = "0.7.90"
+# don't forget to update jackson version in `executor.policy` file.
+jackson = "2.14.0"
+hamcrest = "2.2"
+compose = "1.6.0"
+kotlinx-datetime = "0.6.0-RC.2"
+kotlinx-io-core = "0.5.1"
+
+[libraries]
+kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+kotlin-stdlib-jdk7 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk7", version.ref = "kotlin" }
+kotlin-stdlib-jdk8 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-stdlib-js = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-js", version.ref = "kotlin" }
+kotlin-stdlib-wasm-js = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-wasm-js", version.ref = "kotlin" }
+kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
+kotlin-compiler = { group = "org.jetbrains.kotlin", name = "kotlin-compiler", version.ref = "kotlin" }
+kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
+kotlin-gradle-plugin-idea = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-idea", version.ref = "kotlin" }
+kotlin-dom-api-compat = { group = "org.jetbrains.kotlin", name = "kotlin-dom-api-compat", version.ref = "kotlin" }
+kotlin-compose-compiler-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-compose-compiler-plugin", version.ref = "kotlin" }
+kotlin-base-fe10-analysis = { group = "org.jetbrains.kotlin", name = "base-fe10-analysis", version.ref = "kotlinIdeVersionWithSuffix" }
+kotlin-compiler-ide = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-for-ide", version.ref = "kotlinIdeVersion" }
+kotlin-idea = { group = "org.jetbrains.kotlin", name = "idea", version.ref = "kotlinIdeVersionWithSuffix" }
+kotlin-core = { group = "org.jetbrains.kotlin", name = "core", version.ref = "kotlinIdeVersionWithSuffix" }
+kotlinx-coroutines-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines-test" }
+kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-datetime" }
+kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version.ref = "kotlinx-io-core" }
+springfox-boot-starter = { group = "io.springfox", name = "springfox-boot-starter", version.ref = "springfox-boot-starter" }
+aws-springboot-container = { group = "com.amazonaws.serverless", name = "aws-serverless-java-container-springboot2", version.ref = "aws-serverless-java-container-springboot2" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+logback-logstash-encoder = { group = "net.logstash.logback", name = "logstash-logback-encoder", version.ref = "logstash-logback-encoder" }
+intellij-trove4j = { group = "org.jetbrains.intellij.deps", name = "trove4j", version.ref = "trove4j" }
+skiko-js-wasm-runtime = { group = "org.jetbrains.skiko", name = "skiko-js-wasm-runtime", version.ref = "skiko" }
+jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
+jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version.ref = "jackson" }
+jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jackson" }
+hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
+compose-runtime = { group = "org.jetbrains.compose.runtime", name = "runtime", version.ref = "compose" }
+compose-ui = { group = "org.jetbrains.compose.ui", name = "ui", version.ref = "compose" }
+compose-animation = { group = "org.jetbrains.compose.animation", name = "animation", version.ref = "compose" }
+compose-animation-graphics = { group = "org.jetbrains.compose.animation", name = "animation-graphics", version.ref = "compose" }
+compose-foundation = { group = "org.jetbrains.compose.foundation", name = "foundation", version.ref = "compose" }
+compose-material = { group = "org.jetbrains.compose.material", name = "material", version.ref = "compose" }
+compose-components-resources = { group = "org.jetbrains.compose.components", name = "components-resources", version.ref = "compose" }
+
+
+[bundles]
+kotlin-stdlib = ["kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8"]
+jackson = ["jackson-databind", "jackson-core", "jackson-annotations"]
+compose = ["compose-runtime", "compose-ui", "compose-animation", "compose-animation-graphics", "compose-foundation", "compose-material", "compose-components-resources"]
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-plugin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
+spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
+spring-dependency-management = { id = "io.spring.dependency-management", version.ref = "spring-dependency-managment" }