Provide version in compiler artifact

Author: ileasile

jupyter-lib/kotlin-jupyter-compiler/build.gradle.kts

@@ -60,6 +60,25 @@ tasks {
     }
 }
 
+val buildProperties by tasks.registering {
+    inputs.property("version", version)
+
+    val outputDir = file(project.buildDir.toPath().resolve("resources").resolve("main"))
+    outputs.dir(outputDir)
+
+    doLast {
+        outputDir.mkdirs()
+        val properties = inputs.properties.entries.map { it.toPair() }.toMutableList()
+        val propertiesFile = outputDir.resolve("compiler.properties")
+        propertiesFile.writeText(properties.joinToString("") { "${it.first}=${it.second}\n" })
+
+    }
+}
+
+tasks.processResources {
+    dependsOn(buildProperties)
+}
+
 addPublication {
     publicationName = "compiler"
     artifactId = "compiler"

jupyter-lib/kotlin-jupyter-compiler/src/main/kotlin/org/jetbrains/kotlin/jupyter/compiler/jupyterCompiler.kt

@@ -1,9 +1,11 @@
 package org.jetbrains.kotlin.jupyter.compiler
 
 import kotlinx.coroutines.runBlocking
+import org.jetbrains.kotlin.jupyter.api.KotlinKernelVersion
 import org.jetbrains.kotlin.jupyter.compiler.util.ReplCompilerException
 import org.jetbrains.kotlin.jupyter.compiler.util.SourceCodeImpl
 import org.jetbrains.kotlin.jupyter.compiler.util.actualClassLoader
+import org.jetbrains.kotlin.jupyter.config.readResourceAsIniFile
 import org.jetbrains.kotlin.scripting.compiler.plugin.impl.KJvmReplCompilerBase
 import org.jetbrains.kotlin.scripting.compiler.plugin.repl.ReplCodeAnalyzerBase
 import org.jetbrains.kotlin.scripting.ide_services.compiler.KJvmReplCompilerWithIdeServices
@@ -31,6 +33,12 @@ class JupyterCompiler<CompilerT : ReplCompiler<KJvmCompiledScript>>(
 ) : ReplCompiler<KJvmCompiledScript> by compiler {
     private val executionCounter = AtomicInteger()
     private val classes = mutableListOf<KClass<*>>()
+    private val properties = readResourceAsIniFile("compiler.properties")
+
+    val version: KotlinKernelVersion =
+        KotlinKernelVersion.from(
+            properties["version"] ?: error("Compiler artifact should contain version")
+        )!!
 
     val numberOfSnippets: Int
         get() = classes.size

jupyter-lib/kotlin-jupyter-compiler/src/main/kotlin/org/jetbrains/kotlin/jupyter/config/runtimeProperties.kt

@@ -0,0 +1,7 @@
+package org.jetbrains.kotlin.jupyter.config
+
+fun String.parseIniConfig() =
+    lineSequence().map { it.split('=') }.filter { it.count() == 2 }.map { it[0] to it[1] }.toMap()
+
+fun readResourceAsIniFile(fileName: String) =
+    ClassLoader.getSystemResource(fileName)?.readText()?.parseIniConfig().orEmpty()

src/main/kotlin/org/jetbrains/kotlin/jupyter/config.kt

@@ -15,6 +15,7 @@ import kotlinx.serialization.serializer
 import org.jetbrains.kotlin.jupyter.api.KotlinKernelVersion
 import org.jetbrains.kotlin.jupyter.config.defaultRepositories
 import org.jetbrains.kotlin.jupyter.config.getLogger
+import org.jetbrains.kotlin.jupyter.config.readResourceAsIniFile
 import org.jetbrains.kotlin.jupyter.dependencies.ResolverConfig
 import org.jetbrains.kotlin.jupyter.libraries.LibraryFactory
 import org.zeromq.SocketType
@@ -25,7 +26,7 @@ const val protocolVersion = "5.3"
 internal val log by lazy { getLogger() }
 
 val defaultRuntimeProperties by lazy {
-    RuntimeKernelProperties(ClassLoader.getSystemResource("runtime.properties")?.readText()?.parseIniConfig().orEmpty())
+    RuntimeKernelProperties(readResourceAsIniFile("runtime.properties"))
 }
 
 enum class JupyterSockets(val zmqKernelType: SocketType, val zmqClientType: SocketType) {

src/main/kotlin/org/jetbrains/kotlin/jupyter/util.kt

@@ -6,9 +6,6 @@ import kotlin.script.experimental.api.SourceCode
 import kotlin.script.experimental.jvm.util.determineSep
 import kotlin.script.experimental.jvm.util.toSourceCodePosition
 
-fun String.parseIniConfig() =
-    lineSequence().map { it.split('=') }.filter { it.count() == 2 }.map { it[0] to it[1] }.toMap()
-
 fun List<String>.joinToLines() = joinToString("\n")
 
 fun generateDiagnostic(fromLine: Int, fromCol: Int, toLine: Int, toCol: Int, message: String, severity: String) =

src/test/kotlin/org/jetbrains/kotlin/jupyter/test/ApiTest.kt

@@ -2,8 +2,12 @@ package org.jetbrains.kotlin.jupyter.test
 
 import org.jetbrains.kotlin.jupyter.EvalResult
 import org.jetbrains.kotlin.jupyter.ReplForJupyterImpl
+import org.jetbrains.kotlin.jupyter.compiler.getSimpleCompiler
 import org.junit.jupiter.api.Test
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.ScriptEvaluationConfiguration
 import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 class ApiTest : AbstractReplTest() {
     private val repl = ReplForJupyterImpl(libraryFactory, classpath)
@@ -41,4 +45,14 @@ class ApiTest : AbstractReplTest() {
         val res = repl.eval("x")
         assertEquals(42, res.resultValue)
     }
+
+    @Test
+    fun compilerVersion() {
+        val jCompiler = getSimpleCompiler(
+            ScriptCompilationConfiguration(),
+            ScriptEvaluationConfiguration()
+        )
+        val version = jCompiler.version
+        assertTrue(version.major >= 0)
+    }
 }

src/test/kotlin/org/jetbrains/kotlin/jupyter/test/ConfigTest.kt

@@ -2,11 +2,11 @@ package org.jetbrains.kotlin.jupyter.test
 
 import jupyter.kotlin.JavaRuntime
 import org.jetbrains.kotlin.jupyter.api.KotlinKernelVersion
+import org.jetbrains.kotlin.jupyter.config.parseIniConfig
 import org.jetbrains.kotlin.jupyter.defaultRuntimeProperties
 import org.jetbrains.kotlin.jupyter.libraries.LibrariesDir
 import org.jetbrains.kotlin.jupyter.libraries.LibraryPropertiesFile
 import org.jetbrains.kotlin.jupyter.log
-import org.jetbrains.kotlin.jupyter.parseIniConfig
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Assertions.assertTrue