kscience/dataforge-core
7
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 12 Wiki Activity

Fixed 1.4 build

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle.kts
View File

@ -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")
}

4
dataforge-context/build.gradle.kts
View File

@ -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"

4
dataforge-data/build.gradle.kts
View File

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

2
dataforge-data/src/jvmMain/kotlin/hep/dataforge/data/dataJVM.kt
View File

@ -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
*/
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 =
this.type.isSubclassOf(type)

4
dataforge-io/build.gradle.kts
View File

@ -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"

3
dataforge-io/dataforge-io-yaml/build.gradle.kts
View File

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

2
dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaSerializerTest.kt
View File

@ -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)

4
dataforge-meta/build.gradle.kts
View File

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

4
dataforge-output/build.gradle.kts
View File

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

2
dataforge-output/dataforge-output-html/build.gradle.kts
View File

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

2
dataforge-scripting/build.gradle.kts
View File

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

2
dataforge-tables/build.gradle.kts
View File

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

2
dataforge-workspace/build.gradle.kts
View File

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

21
settings.gradle.kts
View File

@ -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}")
}
}
}
}