Merge pull request '0.10.2' (!87) from dev into master

Reviewed-on: https://git.sciprog.center/kscience/dataforge-core/pulls/87

Author: altavir

.github/workflows/build.yml

@@ -14,12 +14,12 @@ jobs:
     timeout-minutes: 40
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
     - name: Build with Gradle

CHANGELOG.md

@@ -14,6 +14,20 @@
 
 ### Security
 
+## 0.10.2 - 2025-12-17
+
+### Added
+
+- Move Tables-kt to DataForge repository and make it follow DataForge versioning
+
+### Changed
+
+- **BREAKING** `Context.request(plugin)` now has nullable parameter null means taking existing plugin with any configuration.
+
+### Fixed
+
+- Some bugs in name parsing and validation.
+
 ## 0.10.1 - 2025-02-23
 
 ### Added

README.md

@@ -110,6 +110,11 @@ In this section, we will try to cover DataForge main ideas in the form of questi
 >
 > **Maturity**: EXPERIMENTAL
 
+### [tables-kt](tables-kt)
+> A lightweight multiplatform library for tables
+>
+> **Maturity**: EXPERIMENTAL
+
 ### [dataforge-io/dataforge-io-proto](dataforge-io/dataforge-io-proto)
 > ProtoBuf Meta representation
 >
@@ -120,3 +125,19 @@ In this section, we will try to cover DataForge main ideas in the form of questi
 >
 > **Maturity**: PROTOTYPE
 
+### [tables-kt/tables-kt-csv](tables-kt/tables-kt-csv)
+>
+> **Maturity**: EXPERIMENTAL
+
+### [tables-kt/tables-kt-dataframe](tables-kt/tables-kt-dataframe)
+>
+> **Maturity**: PROTOTYPE
+
+### [tables-kt/tables-kt-exposed](tables-kt/tables-kt-exposed)
+>
+> **Maturity**: EXPERIMENTAL
+
+### [tables-kt/tables-kt-jupyter](tables-kt/tables-kt-jupyter)
+>
+> **Maturity**: EXPERIMENTAL
+

build.gradle.kts

@@ -1,3 +1,6 @@
+@file:OptIn(ExperimentalAbiValidation::class)
+
+import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import space.kscience.gradle.useApache2Licence
 import space.kscience.gradle.useSPCTeam
@@ -9,38 +12,43 @@ plugins {
 
 allprojects {
     group = "space.kscience"
-    version = "0.10.1"
+    version = "0.10.2"
 }
 
 subprojects {
     apply(plugin = "maven-publish")
 
     tasks.withType<KotlinCompile> {
         compilerOptions {
-            freeCompilerArgs.add("-Xcontext-receivers")
+            freeCompilerArgs.add("-Xcontext-parameters")
         }
     }
 }
 
-dependencies{
+dependencies {
     subprojects.forEach {
         dokka(it)
     }
 }
 
 readme {
-    readmeTemplate = file("docs/templates/README-TEMPLATE.md")
+    readmeTemplate = file("docs/README-TEMPLATE.md")
 }
 
-ksciencePublish {
+
+kscienceProject {
     pom("https://github.com/SciProgCentre/kmath") {
         useApache2Licence()
         useSPCTeam()
     }
-    repository("spc", "https://maven.sciprog.center/kscience")
-    central()
+    publishTo("spc", "https://maven.sciprog.center/kscience")
+    publishToCentral()
+
+    abiValidation {
+        filters {
+            excluded {
+                annotatedWith.add("space.kscience.dataforge.misc.DFExperimental")
+            }
+        }
+    }
 }
-
-apiValidation {
-    nonPublicMarkers.add("space.kscience.dataforge.misc.DFExperimental")
-}

dataforge-context/README.md

@@ -6,7 +6,7 @@ Context and provider definitions
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:dataforge-context:0.10.0`.
+The Maven coordinates of this project are `space.kscience:dataforge-context:0.10.2`.
 
 **Gradle Kotlin DSL:**
 ```kotlin
@@ -16,6 +16,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:dataforge-context:0.10.0")
+    implementation("space.kscience:dataforge-context:0.10.2")
 }
 ```

dataforge-context/build.gradle.kts

@@ -8,7 +8,7 @@ kscience {
     jvm()
     js()
     native()
-    wasm()
+    wasmJs()
     useCoroutines()
     useSerialization()
     commonMain {

dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginManager.kt

@@ -85,12 +85,13 @@ public class PluginManager internal constructor(
  * Fetch a plugin with given meta from the context. If the plugin (with given meta) is already registered, it is returned.
  * Otherwise, new child context with the plugin is created. In the later case the context could be retrieved from the plugin.
  */
-public inline fun <reified T : Plugin> Context.request(factory: PluginFactory<T>, meta: Meta = Meta.EMPTY): T {
+public inline fun <reified T : Plugin> Context.request(factory: PluginFactory<T>, meta: Meta? = null): T {
     val existing = plugins[factory]
-    return if (existing != null && existing.meta == meta) existing
-    else {
+    return if (existing != null && (meta == null || existing.meta == meta)) {
+        existing
+    } else {
         buildContext(name = this@request.name + factory.tag.name) {
-            plugin(factory, meta)
+            plugin(factory, meta ?: Meta.EMPTY)
         }.plugins[factory]!!
     }
 }

dataforge-data/README.md

@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:dataforge-data:0.10.0`.
+The Maven coordinates of this project are `space.kscience:dataforge-data:0.10.2`.
 
 **Gradle Kotlin DSL:**
 ```kotlin
@@ -16,6 +16,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:dataforge-data:0.10.0")
+    implementation("space.kscience:dataforge-data:0.10.2")
 }
 ```

dataforge-data/build.gradle.kts

@@ -2,17 +2,17 @@ plugins {
     id("space.kscience.gradle.mpp")
 }
 
-kscience{
+kscience {
     jvm()
     js()
     native()
-    wasm()
+    wasmJs()
     useCoroutines()
     dependencies {
         api(projects.dataforgeMeta)
     }
 }
 
-readme{
+readme {
     maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
 }

dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/StaticDataBuilder.kt

@@ -45,7 +45,7 @@ public fun <T> StaticDataBuilder<T>.node(prefix: Name, block: StaticDataBuilder<
     }
 }
 
-public fun <T> StaticDataBuilder<T>.node(prefix: String, block: StaticDataBuilder<T>.() -> Unit) =
+public fun <T> StaticDataBuilder<T>.node(prefix: String, block: StaticDataBuilder<T>.() -> Unit): Unit =
     node(prefix.parseAsName(), block)
 
 public fun <T> StaticDataBuilder<T>.node(prefix: String, tree: DataTree<T>) {