Added possibility of using properties from Gradle in source code, fixed implementation version

Author: ileasile

build.gradle

@@ -2,11 +2,12 @@ import com.beust.klaxon.JsonObject
 
 import java.nio.file.Paths
 import java.util.regex.Pattern
+import java.util.stream.Collectors
 
 buildscript {
     ext.shadowJarVersion = "5.2.0"
     ext.kotlinVersion = '1.3.70-eap-3'
-    ext.baseVersion = '0.7.40'
+    ext.baseVersion = '0.7.41'
     repositories {
         jcenter()
         mavenLocal()
@@ -81,6 +82,10 @@ allprojects {
         debugPort = 1044
         debuggerConfig = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort".toString()
 
+        mainSourceSetDir = "main"
+        resourcesDir = "resources"
+        runtimePropertiesFile = "runtime.properties"
+
         jarsPath = "jars"
         librariesPath = "libraries"
         kernelFile = "kernel.json"
@@ -112,6 +117,7 @@ allprojects {
         distribGroup = "distrib"
         condaGroup = "conda"
         pyPiGroup = "pip"
+        buildGroup = "build"
 
         condaUserStable = rootProject.findProperty('condaUserStable') ?: ''
         condaPasswordStable = rootProject.findProperty('condaPasswordStable') ?: ''
@@ -161,6 +167,25 @@ jar.manifest.attributes(
     'Implementation-Version': version
 )
 
+task buildProperties(group: buildGroup) {
+    def outputDir = file(getSubDir(buildDir.toPath(), resourcesDir, mainSourceSetDir))
+
+    inputs.property "version", version
+    outputs.dir outputDir
+
+    doLast {
+        outputDir.mkdirs()
+        def propertiesFile = file(getSubDir(outputDir.toPath(), runtimePropertiesFile))
+        propertiesFile.text = inputs.properties.entrySet().stream().map {
+            "${it.key}=${it.value}\n"
+        }.collect(Collectors.joining())
+    }
+}
+
+processResources {
+    dependsOn buildProperties
+}
+
 shadowJar {
     archiveBaseName.set(packageName)
     archiveClassifier.set('')

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

@@ -40,14 +40,25 @@ enum class JupyterSockets {
     iopub
 }
 
+data class RuntimeKernelProperties(
+        var version: String = "unspecified"
+) {
+    constructor(map: Map<String, String>?) : this() {
+        if (map == null)
+            return
+        version = map["version"] ?: version
+    }
+}
+
 data class KernelConfig(
         val ports: Array<Int>,
         val transport: String,
         val signatureScheme: String,
         val signatureKey: String,
         val pollingIntervalMillis: Long = 100,
         val scriptClasspath: List<File> = emptyList(),
-        val resolverConfig: ResolverConfig?
+        val resolverConfig: ResolverConfig?,
+        val runtimeProperties: RuntimeKernelProperties = RuntimeKernelProperties()
 )
 
 val protocolVersion = "5.3"

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

@@ -45,6 +45,14 @@ fun printClassPath() {
         log.info("Current classpath: " + cp.joinToString())
 }
 
+fun loadRuntimeProperties(): RuntimeKernelProperties {
+    val map = object{}.javaClass.classLoader
+            .getResource("runtime.properties")
+            ?.readText()?.parseIniConfig()
+
+    return RuntimeKernelProperties(map)
+}
+
 fun main(vararg args: String) {
     try {
         log.info("Kernel args: "+ args.joinToString { it })
@@ -62,7 +70,8 @@ fun main(vararg args: String) {
                 signatureScheme = sigScheme ?: "hmac1-sha256",
                 signatureKey = if (sigScheme == null || key == null) "" else key,
                 scriptClasspath = scriptClasspath,
-                resolverConfig = loadResolverConfig(rootPath)
+                resolverConfig = loadResolverConfig(rootPath),
+                runtimeProperties = loadRuntimeProperties()
         ))
     } catch (e: Exception) {
         log.error("exception running kernel with args: \"${args.joinToString()}\"", e)
@@ -80,7 +89,7 @@ fun kernelServer(config: KernelConfig) {
 
         val executionCount = AtomicLong(1)
 
-        val repl = ReplForJupyter(config.scriptClasspath, config.resolverConfig)
+        val repl = ReplForJupyter(config.scriptClasspath, config.resolverConfig, config.runtimeProperties)
 
         val mainThread = Thread.currentThread()
 

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

@@ -32,13 +32,16 @@ fun JupyterConnection.Socket.shellMessagesHandler(msg: Message, repl: ReplForJup
                             "language_info" to jsonObject(
                                     "name" to "kotlin",
                                     "codemirror_mode" to "text/x-kotlin",
-                                    "file_extension" to ".kt"
+                                    "file_extension" to ".kt",
+                                    "mimetype" to "text/x-kotlin",
+                                    "pygments_lexer" to "kotlin",
+                                    "version" to KotlinCompilerVersion.VERSION
                             ),
 
                             // Jupyter lab Console support
                             "banner" to "Kotlin language, version ${KotlinCompilerVersion.VERSION}",
                             "implementation" to "Kotlin",
-                            "implementation_version" to KotlinCompilerVersion.VERSION,
+                            "implementation_version" to repl!!.properties.version,
                             "status" to "ok"
                     )))
         "history_request" ->

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

@@ -38,7 +38,8 @@ class ReplCompilerException(val errorResult: ReplCompileResult.Error) : ReplExce
 }
 
 class ReplForJupyter(val scriptClasspath: List<File> = emptyList(),
-                     val config: ResolverConfig? = null) {
+                     val config: ResolverConfig? = null,
+                     val properties: RuntimeKernelProperties = RuntimeKernelProperties()) {
 
     private val resolver = JupyterScriptDependenciesResolver(config)