From a767f279a3df565181a7f5f4e0370317cb6ebabd Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 5 Sep 2020 16:19:03 +0300 Subject: [PATCH] Fixed 1.4 build --- build.gradle.kts | 7 +++---- dataforge-context/build.gradle.kts | 4 +++- dataforge-data/build.gradle.kts | 4 +++- .../kotlin/hep/dataforge/data/dataJVM.kt | 2 +- dataforge-io/build.gradle.kts | 4 +++- .../dataforge-io-yaml/build.gradle.kts | 3 +-- .../hep/dataforge/io/MetaSerializerTest.kt | 2 ++ dataforge-meta/build.gradle.kts | 4 +++- dataforge-output/build.gradle.kts | 4 +++- .../dataforge-output-html/build.gradle.kts | 2 +- dataforge-scripting/build.gradle.kts | 2 +- dataforge-tables/build.gradle.kts | 2 +- dataforge-workspace/build.gradle.kts | 2 +- settings.gradle.kts | 21 +++++++------------ 14 files changed, 33 insertions(+), 30 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 09240c13..81c6578b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,9 @@ plugins { - id("kscience.publish") apply false - id("org.jetbrains.dokka") version "1.4.0-rc" + id("ru.mipt.npm.publish") apply false id("org.jetbrains.changelog") version "0.4.0" } -val dataforgeVersion by extra("0.1.9-dev-2") +val dataforgeVersion by extra("0.1.9-dev-5") val bintrayRepo by extra("dataforge") val githubProject by extra("dataforge-core") @@ -20,6 +19,6 @@ allprojects { } subprojects { - apply(plugin = "kscience.publish") + apply(plugin = "ru.mipt.npm.publish") apply(plugin = "org.jetbrains.dokka") } \ No newline at end of file diff --git a/dataforge-context/build.gradle.kts b/dataforge-context/build.gradle.kts index a41e4443..74964376 100644 --- a/dataforge-context/build.gradle.kts +++ b/dataforge-context/build.gradle.kts @@ -1,5 +1,7 @@ plugins { - id("kscience.mpp") + id("ru.mipt.npm.mpp") + id("ru.mipt.npm.node") +// id("ru.mipt.npm.native") } description = "Context and provider definitions" diff --git a/dataforge-data/build.gradle.kts b/dataforge-data/build.gradle.kts index 6afb4230..587f7492 100644 --- a/dataforge-data/build.gradle.kts +++ b/dataforge-data/build.gradle.kts @@ -1,5 +1,7 @@ plugins { - id("kscience.mpp") + id("ru.mipt.npm.mpp") + id("ru.mipt.npm.node") +// id("ru.mipt.npm.native") } kscience{ diff --git a/dataforge-data/src/jvmMain/kotlin/hep/dataforge/data/dataJVM.kt b/dataforge-data/src/jvmMain/kotlin/hep/dataforge/data/dataJVM.kt index e385acc3..34148b4d 100644 --- a/dataforge-data/src/jvmMain/kotlin/hep/dataforge/data/dataJVM.kt +++ b/dataforge-data/src/jvmMain/kotlin/hep/dataforge/data/dataJVM.kt @@ -14,7 +14,7 @@ public fun Data.get(): T = runBlocking { await() } * Check that node is compatible with given type meaning that each element could be cast to the type */ internal actual fun DataNode<*>.canCast(type: KClass): Boolean = - type.isSuperclassOf(type) + this.type.isSubclassOf(type) internal actual fun Data<*>.canCast(type: KClass): Boolean = this.type.isSubclassOf(type) diff --git a/dataforge-io/build.gradle.kts b/dataforge-io/build.gradle.kts index d7d0d8fb..6525a243 100644 --- a/dataforge-io/build.gradle.kts +++ b/dataforge-io/build.gradle.kts @@ -1,5 +1,7 @@ plugins { - id("kscience.mpp") + id("ru.mipt.npm.mpp") + id("ru.mipt.npm.node") +// id("ru.mipt.npm.native") } description = "IO module" diff --git a/dataforge-io/dataforge-io-yaml/build.gradle.kts b/dataforge-io/dataforge-io-yaml/build.gradle.kts index be1cace6..720e1fba 100644 --- a/dataforge-io/dataforge-io-yaml/build.gradle.kts +++ b/dataforge-io/dataforge-io-yaml/build.gradle.kts @@ -1,6 +1,5 @@ - plugins { - id("kscience.jvm") + id("ru.mipt.npm.jvm") } description = "YAML meta IO" diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaSerializerTest.kt b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaSerializerTest.kt index 1f3b235d..75496d7b 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaSerializerTest.kt +++ b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaSerializerTest.kt @@ -3,6 +3,7 @@ package hep.dataforge.io import hep.dataforge.meta.* import hep.dataforge.names.Name import hep.dataforge.names.toName +import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.cbor.Cbor import kotlin.test.Test import kotlin.test.assertEquals @@ -24,6 +25,7 @@ class MetaSerializerTest { assertEquals(meta, restored) } + @OptIn(ExperimentalSerializationApi::class) @Test fun testCborSerialization() { val bytes = Cbor.encodeToByteArray(MetaSerializer, meta) diff --git a/dataforge-meta/build.gradle.kts b/dataforge-meta/build.gradle.kts index 78a9a895..36357552 100644 --- a/dataforge-meta/build.gradle.kts +++ b/dataforge-meta/build.gradle.kts @@ -1,5 +1,7 @@ plugins { - id("kscience.mpp") + id("ru.mipt.npm.mpp") + id("ru.mipt.npm.node") + id("ru.mipt.npm.native") } kscience { diff --git a/dataforge-output/build.gradle.kts b/dataforge-output/build.gradle.kts index d84333ba..1de9ca2e 100644 --- a/dataforge-output/build.gradle.kts +++ b/dataforge-output/build.gradle.kts @@ -1,5 +1,7 @@ plugins { - id("kscience.mpp") + id("ru.mipt.npm.mpp") + id("ru.mipt.npm.node") +// id("ru.mipt.npm.native") } kotlin { diff --git a/dataforge-output/dataforge-output-html/build.gradle.kts b/dataforge-output/dataforge-output-html/build.gradle.kts index fe2de0b9..4b8bdbda 100644 --- a/dataforge-output/dataforge-output-html/build.gradle.kts +++ b/dataforge-output/dataforge-output-html/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("kscience.mpp") + id("ru.mipt.npm.mpp") } val htmlVersion by rootProject.extra("0.7.2") diff --git a/dataforge-scripting/build.gradle.kts b/dataforge-scripting/build.gradle.kts index 9eb40708..cb16b66e 100644 --- a/dataforge-scripting/build.gradle.kts +++ b/dataforge-scripting/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("kscience.mpp") + id("ru.mipt.npm.mpp") } kotlin { diff --git a/dataforge-tables/build.gradle.kts b/dataforge-tables/build.gradle.kts index d84333ba..b181416b 100644 --- a/dataforge-tables/build.gradle.kts +++ b/dataforge-tables/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("kscience.mpp") + id("ru.mipt.npm.mpp") } kotlin { diff --git a/dataforge-workspace/build.gradle.kts b/dataforge-workspace/build.gradle.kts index 0c1972cd..8abe87cd 100644 --- a/dataforge-workspace/build.gradle.kts +++ b/dataforge-workspace/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("kscience.mpp") + id("ru.mipt.npm.mpp") } kotlin { diff --git a/settings.gradle.kts b/settings.gradle.kts index 5f89216d..b6f80363 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,29 +3,22 @@ pluginManagement { mavenLocal() jcenter() gradlePluginPortal() - maven("https://dl.bintray.com/kotlin/kotlin-eap") - maven("https://dl.bintray.com/kotlin/kotlinx") + maven("https://dl.bintray.com/mipt-npm/dataforge") maven("https://dl.bintray.com/mipt-npm/kscience") maven("https://dl.bintray.com/mipt-npm/dev") } - val toolsVersion = "0.6.0-dev-1" + val toolsVersion = "0.6.0-dev-3" val kotlinVersion = "1.4.0" plugins { + id("ru.mipt.npm.mpp") version toolsVersion + id("ru.mipt.npm.jvm") version toolsVersion + id("ru.mipt.npm.js") version toolsVersion + id("ru.mipt.npm.publish") version toolsVersion kotlin("jvm") version kotlinVersion - id("scientifik.mpp") version toolsVersion - id("scientifik.jvm") version toolsVersion - id("scientifik.js") version toolsVersion - id("scientifik.publish") version toolsVersion - } + kotlin("js") version kotlinVersion - resolutionStrategy { - eachPlugin { - when (requested.id.id) { - "kscience.mpp", "kscience.jvm", "kscience.js", "kscience.publish" -> useModule("ru.mipt.npm:gradle-tools:${toolsVersion}") - } - } } }