Fixed 1.4 build

This commit is contained in:
Alexander Nozik 2020-09-05 16:19:03 +03:00
parent b7d01bc40f
commit a767f279a3
14 changed files with 33 additions and 30 deletions
build.gradle.kts
dataforge-context
dataforge-data
build.gradle.kts
src/jvmMain/kotlin/hep/dataforge/data
dataforge-io
build.gradle.kts
dataforge-io-yaml
src/commonTest/kotlin/hep/dataforge/io
dataforge-meta
dataforge-output
dataforge-scripting
dataforge-tables
dataforge-workspace
settings.gradle.kts

@ -1,10 +1,9 @@
plugins { plugins {
id("kscience.publish") apply false id("ru.mipt.npm.publish") apply false
id("org.jetbrains.dokka") version "1.4.0-rc"
id("org.jetbrains.changelog") version "0.4.0" 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 bintrayRepo by extra("dataforge")
val githubProject by extra("dataforge-core") val githubProject by extra("dataforge-core")
@ -20,6 +19,6 @@ allprojects {
} }
subprojects { subprojects {
apply(plugin = "kscience.publish") apply(plugin = "ru.mipt.npm.publish")
apply(plugin = "org.jetbrains.dokka") apply(plugin = "org.jetbrains.dokka")
} }

@ -1,5 +1,7 @@
plugins { plugins {
id("kscience.mpp") id("ru.mipt.npm.mpp")
id("ru.mipt.npm.node")
// id("ru.mipt.npm.native")
} }
description = "Context and provider definitions" description = "Context and provider definitions"

@ -1,5 +1,7 @@
plugins { plugins {
id("kscience.mpp") id("ru.mipt.npm.mpp")
id("ru.mipt.npm.node")
// id("ru.mipt.npm.native")
} }
kscience{ kscience{

@ -14,7 +14,7 @@ public fun <T : Any> Data<T>.get(): T = runBlocking { await() }
* Check that node is compatible with given type meaning that each element could be cast to the type * Check that node is compatible with given type meaning that each element could be cast to the type
*/ */
internal actual fun <R : Any> DataNode<*>.canCast(type: KClass<out R>): Boolean = internal actual fun <R : Any> DataNode<*>.canCast(type: KClass<out R>): Boolean =
type.isSuperclassOf(type) this.type.isSubclassOf(type)
internal actual fun <R : Any> Data<*>.canCast(type: KClass<out R>): Boolean = internal actual fun <R : Any> Data<*>.canCast(type: KClass<out R>): Boolean =
this.type.isSubclassOf(type) this.type.isSubclassOf(type)

@ -1,5 +1,7 @@
plugins { plugins {
id("kscience.mpp") id("ru.mipt.npm.mpp")
id("ru.mipt.npm.node")
// id("ru.mipt.npm.native")
} }
description = "IO module" description = "IO module"

@ -1,6 +1,5 @@
plugins { plugins {
id("kscience.jvm") id("ru.mipt.npm.jvm")
} }
description = "YAML meta IO" description = "YAML meta IO"

@ -3,6 +3,7 @@ package hep.dataforge.io
import hep.dataforge.meta.* import hep.dataforge.meta.*
import hep.dataforge.names.Name import hep.dataforge.names.Name
import hep.dataforge.names.toName import hep.dataforge.names.toName
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.cbor.Cbor import kotlinx.serialization.cbor.Cbor
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
@ -24,6 +25,7 @@ class MetaSerializerTest {
assertEquals(meta, restored) assertEquals(meta, restored)
} }
@OptIn(ExperimentalSerializationApi::class)
@Test @Test
fun testCborSerialization() { fun testCborSerialization() {
val bytes = Cbor.encodeToByteArray(MetaSerializer, meta) val bytes = Cbor.encodeToByteArray(MetaSerializer, meta)

@ -1,5 +1,7 @@
plugins { plugins {
id("kscience.mpp") id("ru.mipt.npm.mpp")
id("ru.mipt.npm.node")
id("ru.mipt.npm.native")
} }
kscience { kscience {

@ -1,5 +1,7 @@
plugins { plugins {
id("kscience.mpp") id("ru.mipt.npm.mpp")
id("ru.mipt.npm.node")
// id("ru.mipt.npm.native")
} }
kotlin { kotlin {

@ -1,5 +1,5 @@
plugins { plugins {
id("kscience.mpp") id("ru.mipt.npm.mpp")
} }
val htmlVersion by rootProject.extra("0.7.2") val htmlVersion by rootProject.extra("0.7.2")

@ -1,5 +1,5 @@
plugins { plugins {
id("kscience.mpp") id("ru.mipt.npm.mpp")
} }
kotlin { kotlin {

@ -1,5 +1,5 @@
plugins { plugins {
id("kscience.mpp") id("ru.mipt.npm.mpp")
} }
kotlin { kotlin {

@ -1,5 +1,5 @@
plugins { plugins {
id("kscience.mpp") id("ru.mipt.npm.mpp")
} }
kotlin { kotlin {

@ -3,29 +3,22 @@ pluginManagement {
mavenLocal() mavenLocal()
jcenter() jcenter()
gradlePluginPortal() gradlePluginPortal()
maven("https://dl.bintray.com/kotlin/kotlin-eap") maven("https://dl.bintray.com/mipt-npm/dataforge")
maven("https://dl.bintray.com/kotlin/kotlinx")
maven("https://dl.bintray.com/mipt-npm/kscience") maven("https://dl.bintray.com/mipt-npm/kscience")
maven("https://dl.bintray.com/mipt-npm/dev") 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" val kotlinVersion = "1.4.0"
plugins { 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 kotlin("jvm") version kotlinVersion
id("scientifik.mpp") version toolsVersion kotlin("js") version kotlinVersion
id("scientifik.jvm") version toolsVersion
id("scientifik.js") version toolsVersion
id("scientifik.publish") version toolsVersion
}
resolutionStrategy {
eachPlugin {
when (requested.id.id) {
"kscience.mpp", "kscience.jvm", "kscience.js", "kscience.publish" -> useModule("ru.mipt.npm:gradle-tools:${toolsVersion}")
}
}
} }
} }