Merge pull request #77 from SciProgCentre/dev

0.6.2

.github/workflows/pages.yml

@@ -1,28 +1,31 @@
 name: Dokka publication
 
 on:
-  push:
-    branches: [ master ]
+  workflow_dispatch:
+  release:
+    types: [ created ]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 40
     steps:
-      - uses: actions/checkout@v2
-      - uses: DeLaGuardo/setup-graalvm@4.0
+      - uses: actions/checkout@v3.0.0
+      - uses: actions/setup-java@v3.0.0
         with:
-          graalvm: 21.2.0
-          java: java11
-          arch: amd64
-      - uses: actions/cache@v2
+          java-version: 11
+          distribution: liberica
+      - name: Cache konan
+        uses: actions/cache@v3.0.1
         with:
-          path: ~/.gradle/caches
+          path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - run: ./gradlew dokkaHtmlMultiModule --build-cache --no-daemon --no-parallel --stacktrace
-      - uses: JamesIves/github-pages-deploy-action@4.1.0
+      - uses: gradle/gradle-build-action@v2.1.5
+        with:
+          arguments: dokkaHtmlMultiModule --no-parallel
+      - uses: JamesIves/github-pages-deploy-action@v4.3.0
         with:
           branch: gh-pages
           folder: build/dokka/htmlMultiModule

.github/workflows/publish.yml

@@ -9,47 +9,42 @@ jobs:
   publish:
     environment:
       name: publish
-    env:
-      publishing.github: false
     strategy:
       matrix:
         os: [ macOS-latest, windows-latest ]
     runs-on: ${{matrix.os}}
     steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: DeLaGuardo/setup-graalvm@4.0
+      - uses: actions/checkout@v3.0.0
+      - uses: actions/setup-java@v3.10.0
         with:
-          graalvm: 21.2.0
-          java: java11
-          arch: amd64
-      - name: Cache gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          java-version: 11
+          distribution: liberica
       - name: Cache konan
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.1
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
-        shell: cmd
-        run: >
-          ./gradlew release --no-daemon --build-cache -Ppublishing.enabled=true
-          -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
-          -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
+        uses: gradle/gradle-build-action@v2.4.0
+        with:
+          arguments: |
+            publishAllPublicationsToSpaceRepository
+            -Ppublishing.targets=all
+            -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+            -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
-        run: >
-          ./gradlew release --no-daemon --build-cache -Ppublishing.enabled=true
-          -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
-          -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
+        uses: gradle/gradle-build-action@v2.4.0
+        with:
+          arguments: |
+            publishMacosX64PublicationToSpaceRepository
+            publishMacosArm64PublicationToSpaceRepository
+            publishIosX64PublicationToSpaceRepository
+            publishIosArm64PublicationToSpaceRepository
+            publishIosSimulatorArm64PublicationToSpaceRepository
+            -Ppublishing.targets=all
+            -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+            -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}

CHANGELOG.md

@@ -14,6 +14,12 @@
 
 ### Security
 
+## 0.6.2 - 2023-07-29
+
+### Changed
+- Meta to Json serializer now serializes a single item with index as an array. It is important for plotly integration.
+- Meta to Json serializes Meta without children a value as literal or array instead of an object with `@value` field.
+
 ## 0.6.1 - 2023-03-31
 
 ### Added

README.md

@@ -3,47 +3,39 @@
 
 ![Gradle build](https://github.com/mipt-npm/dataforge-core/workflows/Gradle%20build/badge.svg)
 
-<hr/>
 
-* ### [dataforge-context](dataforge-context)
+### [dataforge-context](dataforge-context)
 > 
 >
 > **Maturity**: DEVELOPMENT
-<hr/>
 
-* ### [dataforge-data](dataforge-data)
+### [dataforge-data](dataforge-data)
 > 
 >
 > **Maturity**: EXPERIMENTAL
-<hr/>
 
-* ### [dataforge-io](dataforge-io)
+### [dataforge-io](dataforge-io)
 > 
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 
-* ### [dataforge-meta](dataforge-meta)
+### [dataforge-meta](dataforge-meta)
 > 
 >
 > **Maturity**: DEVELOPMENT
-<hr/>
 
-* ### [dataforge-scripting](dataforge-scripting)
+### [dataforge-scripting](dataforge-scripting)
 > 
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 
-* ### [dataforge-workspace](dataforge-workspace)
+### [dataforge-workspace](dataforge-workspace)
 > 
 >
 > **Maturity**: EXPERIMENTAL
-<hr/>
 
-* ### [dataforge-io-yaml](dataforge-io/dataforge-io-yaml)
+### [dataforge-io/dataforge-io-yaml](dataforge-io/dataforge-io-yaml)
 > YAML meta converters and Front Matter envelope format
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 

build.gradle.kts

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

dataforge-context/README.md

@@ -0,0 +1,32 @@
+# Module dataforge-context
+
+Context and provider definitions
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:dataforge-context:0.6.2-dev-2`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:dataforge-context:0.6.2-dev-2'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:dataforge-context:0.6.2-dev-2")
+}
+```

dataforge-data/README.md

@@ -0,0 +1,32 @@
+# Module dataforge-data
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:dataforge-data:0.6.2-dev-2`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:dataforge-data:0.6.2-dev-2'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:dataforge-data:0.6.2-dev-2")
+}
+```

dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/ReduceAction.kt

@@ -112,7 +112,6 @@ internal class ReduceAction<T : Any, R : Any>(
  * A one-to-one mapping action
  */
 @DFExperimental
-@Suppress("FunctionName")
 public inline fun <reified T : Any, reified R : Any> Action.Companion.reduce(
     noinline builder: ReduceGroupBuilder<T, R>.() -> Unit,
 ): Action<T, R> = ReduceAction(typeOf<R>(), builder)

dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/SplitAction.kt

@@ -87,7 +87,6 @@ internal class SplitAction<T : Any, R : Any>(
  * Action that splits each incoming element into a number of fragments defined in builder
  */
 @DFExperimental
-@Suppress("FunctionName")
 public inline fun <T : Any, reified R : Any> Action.Companion.split(
     noinline builder: SplitBuilder<T, R>.() -> Unit,
 ): Action<T, R> = SplitAction(typeOf<R>(), builder)

dataforge-io/README.md

@@ -0,0 +1,32 @@
+# Module dataforge-io
+
+IO module
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:dataforge-io:0.6.2-dev-2`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:dataforge-io:0.6.2-dev-2'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:dataforge-io:0.6.2-dev-2")
+}
+```

dataforge-io/build.gradle.kts

@@ -10,8 +10,8 @@ kscience {
     jvm()
     js()
     native()
-    useSerialization("1.4.1")
-    useSerialization("1.4.1", sourceSet = space.kscience.gradle.DependencySourceSet.TEST) {
+    useSerialization()
+    useSerialization(sourceSet = space.kscience.gradle.DependencySourceSet.TEST) {
         cbor()
     }
     dependencies {
@@ -20,6 +20,6 @@ kscience {
     }
 }
 
-readme{
+readme {
     maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }

dataforge-io/dataforge-io-yaml/README.md

@@ -0,0 +1,32 @@
+# Module dataforge-io-yaml
+
+YAML meta IO
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:dataforge-io-yaml:0.6.2-dev-2`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:dataforge-io-yaml:0.6.2-dev-2'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:dataforge-io-yaml:0.6.2-dev-2")
+}
+```

dataforge-io/dataforge-io-yaml/build.gradle.kts

@@ -4,10 +4,6 @@ plugins {
 
 description = "YAML meta IO"
 
-repositories {
-    mavenCentral()
-}
-
 kscience {
     jvm()
     js()
@@ -20,10 +16,6 @@ kscience {
     }
 }
 
-repositories{
-    maven("https://dl.bintray.com/mamoe/yamlkt")
-}
-
 readme{
     maturity = space.kscience.gradle.Maturity.PROTOTYPE
     description ="""