Dev #41

Merged
altavir merged 17 commits from dev into master 2022-03-15 13:06:15 +03:00
2 changed files with 7 additions and 7 deletions
Showing only changes of commit 820664a74b - Show all commits

View File

@ -1,6 +1,6 @@
[versions] [versions]
tools = "0.10.8-kotlin-1.6.0" tools = "0.10.9-kotlin-1.6.10"
kotlin = "1.6.0" kotlin = "1.6.10"
atomicfu = "0.17.0" atomicfu = "0.17.0"
binary-compatibility-validator = "0.8.0" binary-compatibility-validator = "0.8.0"
changelog = "1.3.1" changelog = "1.3.1"
@ -9,16 +9,16 @@ kotlin-jupyter = "0.11.0-39"
kotlinx-benchmark = "0.3.1" kotlinx-benchmark = "0.3.1"
kotlinx-cli = "0.3.3" kotlinx-cli = "0.3.3"
kotlinx-collections-immutable = "0.3.4" kotlinx-collections-immutable = "0.3.4"
kotlinx-coroutines = "1.5.2" kotlinx-coroutines = "1.6.0-RC3"
kotlinx-datetime = "0.3.1" kotlinx-datetime = "0.3.1"
kotlinx-html = "0.7.3" kotlinx-html = "0.7.3"
kotlinx-knit = "0.3.0" kotlinx-knit = "0.3.0"
kotlinx-nodejs = "0.0.7" kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.3.1" kotlinx-serialization = "1.3.1"
ktor = "1.6.6" ktor = "1.6.7"
xmlutil = "0.83.0" xmlutil = "0.83.0"
yamlkt = "0.10.2" 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" junit = "5.8.1"
[libraries] [libraries]

View File

@ -143,10 +143,10 @@ public class KScienceExtension(public val project: Project) {
/** /**
* Apply jupyter plugin and add entry point for the jupyter library * 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.plugins.apply("org.jetbrains.kotlin.jupyter.api")
project.tasks.named("processJupyterApiResources", JupyterApiResourcesTask::class.java) { project.tasks.named("processJupyterApiResources", JupyterApiResourcesTask::class.java) {
libraryProducers = listOf(pluginClass, *additionalPluginClasses) libraryProducers = pluginClasses.toList()
} }
} }