Merge pull request #755 from JetBrains/dkrasnov/2.0.20-prepared-to-merge

Merge 2.0.20 to master

Author: nikpachoo

.github/workflows/collect-samples-cron.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Run a verifier
         uses: AlexanderPrendota/kotlin-samples-verifier@master
         with:

.github/workflows/gradle.yml

@@ -13,7 +13,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         java-version: '17'
-        distribution: 'adopt'
+        distribution: 'corretto'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

.gitignore

@@ -5,6 +5,13 @@ build/
 !**/src/test/**
 src/main/resources/application.properties
 
+# compile artifacts
+.kotlin/
+1.9.*/
+2.*/
+indexes*.json
+*.log
+
 ### STS ###
 .apt_generated
 .classpath

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)
@@ -52,108 +52,12 @@ remove [aws-serverless-container](https://github.com/awslabs/aws-serverless-java
 
 ## API Documentation :page_with_curl:
 
-### Execute Kotlin code on JVM
-
-```shell script
-curl -X POST \
-  http://localhost:8080/api/compiler/run \
-  -H 'Content-Type: application/json' \
-  -d '{
-    "args": "1 2 3",
-    "files": [
-        {
-            "name": "File.kt",
-            "text": "fun main() {\n    println(\"123\")\n}"
-        }
-    ]
-}'
-```
-
-### Translate Kotlin code to JavaScript code
-
-```shell script
-curl -X POST \
-    http://localhost:8080/api/compiler/translate \
-    -H 'Content-Type: application/json' \
-    -d '{
-      "args": "1 2 3",
-      "files": [
-        {
-          "name": "File.kt",
-          "text": "fun main(args: Array<String>) {\n    println(args[0])\n }"
-        }
-      ]
-}'
-```
-
-### Run Kotlin tests
-
-```shell script
-curl -X POST \
-  http://localhost:8080/api/compiler/test \
-  -H 'Content-Type: application/json' \
-  -d '{
-  "files": [
-    {
-      "name": "File.kt",
-      "text": "fun start(): String = \"OK\""
-    },
-    {
-      "name": "test0.kt",
-      "text": "import org.junit.Assert\nimport org.junit.Test\n\nclass TestStart {\n    @Test fun testOk() {\n        Assert.assertEquals(\"OK\", start())\n    }\n}"
-    },
-    {
-      "name": "test1.kt",
-      "text": "package koans.util\n\nfun String.toMessage() = \"The function '\''$this'\'' is implemented incorrectly\"\n\nfun String.toMessageInEquals() = toMessage().inEquals()\n\nfun String.inEquals() = this"
-    }
-  ]
-}'
-```
-
-### Get code completions for a specified place in code
-
-```shell script
-curl -X POST \
-  'http://localhost:8080/api/compiler/complete?line=2&ch=15' \
-  -H 'Content-Type: application/json' \
-  -d '{
-  "files": [
-    {
-      "name": "File.kt",
-      "text": "fun main() {\n    val sinusoid = \"sinusoid\"\n    val s = sin\n}"
-    }
-  ]
-}'
-```
-
-### Get code analysis results
-
-```shell script
-curl -X POST \
-  http://localhost:8080/api/compiler/highlight \
-  -H 'Content-Type: application/json' \
-  -d '{
-  "files": [
-    {
-      "name": "File.kt",
-      "text": "fun main() {\n    println(\"Hello, world!!!\")ass\n    val random = Random\n}"
-    }
-  ]
-}'
-```
-
-### Get the current Kotlin version
-
-```shell script
-curl -X GET http://localhost:8080/versions
-```
-
-The server also supports an [API](https://github.com/JetBrains/kotlin-playground) for the Kotlin Playground library.
+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`:
 
 ```
@@ -163,7 +67,7 @@ task called `kotlinDependency`:
 NOTE: If the library you're adding uses reflection, accesses the file system, or performs any other type of
 security-sensitive operations, don't forget to
 configure
-the [executors.policy](https://github.com/AlexanderPrednota/kotlin-compiler-server/blob/master/executors.policy)
+the [executor.policy](https://github.com/JetBrains/kotlin-compiler-server/blob/master/executor.policy)
 . [Click here](https://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html) for more information
 about *Java Security Policy*.
 
@@ -209,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-settings-logic/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    `kotlin-dsl`
+}

build-settings-logic/settings.gradle.kts

@@ -0,0 +1,10 @@
+rootProject.name = "build-settings-logic"
+
+dependencyResolutionManagement {
+
+    @Suppress("UnstableApiUsage")
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}

build-settings-logic/src/main/kotlin/kotlin-compiler-server-version-catalog.settings.gradle.kts

@@ -0,0 +1,10 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        register("libs").configure {
+            val kotlinVersion = providers.gradleProperty("kotlinVersion")
+            if (kotlinVersion.isPresent) {
+                version("kotlin", kotlinVersion.get())
+            }
+        }
+    }
+}

build.gradle.kts

@@ -7,17 +7,20 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
 val policy: String by System.getProperties()
 
 group = "com.compiler.server"
-version = "$kotlinVersion-SNAPSHOT"
-java.sourceCompatibility = JavaVersion.VERSION_17
+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 {
+    languageVersion.set(JavaLanguageVersion.of(17))
+    vendor.set(JvmVendorSpec.AMAZON)
 }
 
 apply<NodeJsRootPlugin>()
@@ -42,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
                 }
             }
@@ -59,30 +62,29 @@ dependencies {
     annotationProcessor("org.springframework:spring-context-indexer")
     implementation("com.google.code.gson:gson")
     implementation("org.springframework.boot:spring-boot-starter-web")
-    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() {
@@ -111,16 +113,9 @@ fun generateProperties(prefix: String = "") = """
     server.compression.mime-types=application/json,text/javascript,application/wasm
 """.trimIndent()
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of("17"))
-    }
-}
-
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "17"
+    compilerOptions {
+        freeCompilerArgs.set(listOf("-Xjsr305=strict"))
     }
     dependsOn(":dependencies:copyDependencies")
     dependsOn(":dependencies:copyJSDependencies")
@@ -131,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")
@@ -143,7 +138,9 @@ val buildLambda by tasks.creating(Zip::class) {
     from(tasks.compileKotlin)
     from(tasks.processResources) {
         eachFile {
-            if (name == propertyFile) { file.writeText(generateProperties(lambdaWorkDirectoryPath)) }
+            if (name == propertyFile) {
+                file.writeText(generateProperties(lambdaWorkDirectoryPath))
+            }
         }
     }
     from(policy)
@@ -176,7 +173,7 @@ tasks.withType<Test> {
     doFirst {
         this@withType.environment(
             "kotlin.wasm.node.path",
-            rootProject.the<NodeJsRootExtension>().requireConfigured().nodeExecutable
+            rootProject.the<NodeJsRootExtension>().requireConfigured().executable
         )
     }
 }

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,19 @@
+pluginManagement {
+    includeBuild("../build-settings-logic")
+}
+
+dependencyResolutionManagement {
+    // For buildSrc we need to declare a custom path to the toml file with versions' catalog.
+    // But for a root project we can't set `from` inside `versionCatalogs` catalog block for the default `libs` catalog.
+    // (see https://github.com/gradle/gradle/issues/21328)
+    // That is why it is not fully moved to the dependencyResolutionManagement block in the settings convention plugin.
+    versionCatalogs {
+        getByName("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+plugins {
+    id("kotlin-compiler-server-version-catalog")
+}