From 820664a74b6f4053e98d6f84625f9684130c17a6 Mon Sep 17 00:00:00 2001 From: darksnake Date: Sun, 19 Dec 2021 11:43:13 +0300 Subject: [PATCH] Add blank jupyter integration --- gradle/libs.versions.toml | 10 +++++----- .../kotlin/ru/mipt/npm/gradle/KScienceExtension.kt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8b9468f..0932a77 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.10.8-kotlin-1.6.0" -kotlin = "1.6.0" +tools = "0.10.9-kotlin-1.6.10" +kotlin = "1.6.10" atomicfu = "0.17.0" binary-compatibility-validator = "0.8.0" changelog = "1.3.1" @@ -9,16 +9,16 @@ kotlin-jupyter = "0.11.0-39" kotlinx-benchmark = "0.3.1" kotlinx-cli = "0.3.3" kotlinx-collections-immutable = "0.3.4" -kotlinx-coroutines = "1.5.2" +kotlinx-coroutines = "1.6.0-RC3" kotlinx-datetime = "0.3.1" kotlinx-html = "0.7.3" kotlinx-knit = "0.3.0" kotlinx-nodejs = "0.0.7" kotlinx-serialization = "1.3.1" -ktor = "1.6.6" +ktor = "1.6.7" xmlutil = "0.83.0" yamlkt = "0.10.2" -jsBom = "0.0.1-pre.279-kotlin-1.6.0" +jsBom = "0.0.1-pre.281-kotlin-1.6.10" junit = "5.8.1" [libraries] diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt index 747a768..98ffec7 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt @@ -143,10 +143,10 @@ public class KScienceExtension(public val project: Project) { /** * Apply jupyter plugin and add entry point for the jupyter library */ - public fun jupyterLibrary(pluginClass: String, vararg additionalPluginClasses: String) { + public fun jupyterLibrary(vararg pluginClasses: String) { project.plugins.apply("org.jetbrains.kotlin.jupyter.api") project.tasks.named("processJupyterApiResources", JupyterApiResourcesTask::class.java) { - libraryProducers = listOf(pluginClass, *additionalPluginClasses) + libraryProducers = pluginClasses.toList() } }