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

Move to gradle plugin 0.14

Browse Source
This commit is contained in:
Alexander Nozik 2023-02-18 19:49:41 +03:00
parent 5d7ddb4e00
commit 7d88f828d7
12 changed files with 61 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -9,7 +9,7 @@ plugins {
allprojects {
group = "space.kscience"
version = "0.6.1-dev-1"
version = "0.6.1-dev-2"
}
subprojects {

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

@ -5,28 +5,16 @@ plugins {
description = "Context and provider definitions"
kscience {
jvm()
js()
native()
useCoroutines()
}
kotlin {
sourceSets {
val commonMain by getting {
dependencies {
api(project(":dataforge-meta"))
}
}
jvmMain {
dependencies {
api(kotlin("reflect"))
api("org.slf4j:slf4j-api:1.7.30")
}
}
jsMain {
dependencies {
}
}
dependencies {
api(project(":dataforge-meta"))
}
dependencies(jvmMain){
api(kotlin("reflect"))
api("org.slf4j:slf4j-api:1.7.30")
}
}

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

@ -3,18 +3,13 @@ plugins {
}
kscience{
jvm()
js()
native()
useCoroutines()
}
kotlin {
sourceSets {
commonMain{
dependencies {
api(project(":dataforge-meta"))
api(kotlin("reflect"))
}
}
dependencies {
api(project(":dataforge-meta"))
api(kotlin("reflect"))
}
}

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

@ -7,22 +7,16 @@ plugins {
description = "IO module"
kscience {
jvm()
js()
native()
useSerialization(sourceSet = space.kscience.gradle.DependencySourceSet.TEST) {
useSerialization("1.4.1")
useSerialization("1.4.1", sourceSet = space.kscience.gradle.DependencySourceSet.TEST) {
cbor()
}
}
//val ioVersion by rootProject.extra("0.2.0-npm-dev-11")
kotlin {
sourceSets {
commonMain {
dependencies {
api(project(":dataforge-context"))
api("io.ktor:ktor-io:${KScienceVersions.ktorVersion}")
}
}
dependencies {
api(project(":dataforge-context"))
api("io.ktor:ktor-io:${KScienceVersions.ktorVersion}")
}
}

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

@ -4,9 +4,18 @@ plugins {
description = "YAML meta IO"
repositories {
mavenCentral()
}
kscience {
jvm()
js()
native()
useSerialization{
dependencies {
api(projects.dataforgeIo)
}
useSerialization("1.4.1"){
yamlKt()
}
}
@ -15,16 +24,6 @@ repositories{
maven("https://dl.bintray.com/mamoe/yamlkt")
}
kotlin {
sourceSets {
commonMain{
dependencies {
api(project(":dataforge-io"))
}
}
}
}
readme{
maturity = space.kscience.gradle.Maturity.PROTOTYPE
description ="""

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

@ -3,8 +3,10 @@ plugins {
}
kscience {
jvm()
js()
native()
useSerialization{
useSerialization("1.4.1"){
json()
}
}

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

@ -2,28 +2,23 @@ plugins {
id("space.kscience.gradle.mpp")
}
kotlin {
sourceSets {
commonMain {
dependencies {
api(project(":dataforge-workspace"))
implementation(kotlin("scripting-common"))
}
}
jvmMain{
dependencies {
implementation(kotlin("scripting-jvm-host"))
implementation(kotlin("scripting-jvm"))
}
}
jvmTest {
dependencies {
implementation("ch.qos.logback:logback-classic:1.2.3")
}
}
kscience{
jvm()
js()
dependencies {
api(projects.dataforgeWorkspace)
implementation(kotlin("scripting-common"))
}
dependencies(jvmMain){
implementation(kotlin("scripting-jvm-host"))
implementation(kotlin("scripting-jvm"))
}
dependencies(jvmTest){
implementation(spclibs.logback.classic)
}
}
readme{
maturity = space.kscience.gradle.Maturity.PROTOTYPE
}

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

@ -3,24 +3,17 @@ plugins {
}
kscience{
jvm()
js()
native()
useCoroutines()
}
kotlin {
sourceSets {
commonMain{
dependencies {
api(project(":dataforge-context"))
api(project(":dataforge-data"))
api(project(":dataforge-io"))
}
}
jvmTest{
dependencies{
implementation("ch.qos.logback:logback-classic:1.4.1")
}
}
dependencies {
api(projects.dataforgeContext)
api(projects.dataforgeData)
api(projects.dataforgeIo)
}
dependencies(jvmTest){
implementation(spclibs.logback.classic)
}
}

2
dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/fileData.kt
View File

@ -82,7 +82,7 @@ public fun <T : Any> IOPlugin.readDataFile(
context(IOPlugin) @DFExperimental
private fun <T : Any> DataSetBuilder<T>.directory(path: Path, formatResolver: FileFormatResolver<T>) {
Files.list(path).toList().forEach { childPath ->
Files.list(path).forEach { childPath ->
val fileName = childPath.fileName.toString()
if (fileName.startsWith(IOPlugin.META_FILE_NAME)) {
meta(readMetaFile(childPath))

2
gradle.properties
View File

@ -6,4 +6,4 @@ kotlin.mpp.stability.nowarn=true
kotlin.incremental.js.ir=true
kotlin.native.ignoreDisabledTargets=true
toolsVersion=0.13.3-kotlin-1.7.20
toolsVersion=0.14.2-kotlin-1.8.10

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
settings.gradle.kts
View File

@ -33,7 +33,7 @@ dependencyResolutionManagement {
}
versionCatalogs {
create("npmlibs") {
create("spclibs") {
from("space.kscience:version-catalog:$toolsVersion")
}
}