Build update

build.gradle

@@ -1,32 +0,0 @@
-buildscript {
-    ext.kotlin_version = '1.3.10'
-    ext.serialization_version = '0.9.1'
-    ext.kotlinx_io_version = '0.1.0'
-
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4+"
-    }
-}
-
-allprojects {
-    apply plugin: 'maven-publish'
-    apply plugin: "com.jfrog.artifactory"
-
-    repositories {
-        jcenter()
-        maven { url = "https://kotlin.bintray.com/kotlinx" }
-    }
-
-    group = 'hep.dataforge'
-    version = '0.1.1-SNAPSHOT'
-}
-
-if(file('aritfactory.gradle').exists()) {
-    apply from: 'aritfactory.gradle'
-}

build.gradle.kts

@@ -0,0 +1,43 @@
+buildscript {
+    extra["kotlinVersion"] = "1.3.11"
+    extra["ioVersion"] = "0.1.2-dev-2"
+    extra["serializationVersion"] = "0.9.1"
+    extra["coroutinesVersion"] = "1.0.1"
+
+    val kotlinVersion: String by extra
+    val ioVersion: String by extra
+    val coroutinesVersion: String by extra
+    val serializationVersion: String by extra
+
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
+        classpath("org.jfrog.buildinfo:build-info-extractor-gradle:4+")
+    }
+}
+
+plugins {
+    id("com.jfrog.artifactory") version "4.8.1" apply false
+//    id("org.jetbrains.kotlin.multiplatform") apply false
+}
+
+allprojects {
+    apply(plugin = "maven-publish")
+    apply(plugin = "com.jfrog.artifactory")
+
+    repositories {
+        jcenter()
+        maven("https://kotlin.bintray.com/kotlinx")
+    }
+
+    group = "hep.dataforge"
+    version = "0.1.1-dev-1"
+}
+
+if (file("artifactory.gradle").exists()) {
+    apply(from = "artifactory.gradle")
+}

dataforge-meta-io/build.gradle

@@ -4,10 +4,6 @@ plugins {
 
 description = "IO for meta"
 
-repositories {
-    jcenter()
-}
-
 kotlin {
     targets {
         fromPreset(presets.jvm, 'jvm')
@@ -22,8 +18,8 @@ kotlin {
             dependencies {
                 api project(":dataforge-meta")
                 //implementation 'org.jetbrains.kotlin:kotlin-reflect'
-                implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$serialization_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$serializationVersion"
-                implementation "org.jetbrains.kotlinx:kotlinx-io:$kotlinx_io_version"
+                api "org.jetbrains.kotlinx:kotlinx-io:$ioVersion"
             }
         }
         commonTest {
@@ -34,8 +30,8 @@ kotlin {
         }
         jvmMain {
             dependencies {
-                implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion"
-                implementation "org.jetbrains.kotlinx:kotlinx-io-jvm:$kotlinx_io_version"
+                api "org.jetbrains.kotlinx:kotlinx-io-jvm:$ioVersion"
             }
         }
         jvmTest {
@@ -46,8 +42,8 @@ kotlin {
         }
         jsMain {
             dependencies {
-                implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$serialization_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$serializationVersion"
-                implementation "org.jetbrains.kotlinx:kotlinx-io-js:$kotlinx_io_version"
+                api "org.jetbrains.kotlinx:kotlinx-io-js:$ioVersion"
             }
         }
         jsTest {

dataforge-meta-io/src/commonTest/kotlin/hep/dataforge/meta/io/MetaFormatTest.kt

@@ -16,7 +16,7 @@ class MetaFormatTest{
         }
         val string =  meta.asString(BinaryMetaFormat)
         val result = BinaryMetaFormat.parse(string)
-        assertEquals(meta,result)
+        assertEquals(meta, result)
     }
 
     @Test

dataforge-meta/build.gradle

@@ -2,10 +2,6 @@ plugins {
     id "org.jetbrains.kotlin.multiplatform"
 }
 
-repositories {
-    jcenter()
-}
-
 kotlin {
     targets {
         fromPreset(presets.jvm, 'jvm')

settings.gradle

@@ -1,39 +0,0 @@
-pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "kotlin-platform-common") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-            }
-            if (requested.id.id == "kotlin-platform-jvm") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-            }
-            if (requested.id.id == "kotlin-platform-js") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-            }
-            if (requested.id.id == "org.jetbrains.kotlin.multiplatform") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-            }
-        }
-    }
-
-    repositories {
-        mavenCentral()
-        maven { url = 'https://plugins.gradle.org/m2/' }
-    }
-}
-
-//enableFeaturePreview('GRADLE_METADATA')
-
-rootProject.name = 'dataforge-core'
-
-include ":dataforge-meta"
-include ":dataforge-meta-io"
-
-include ":dataforge-context"
-include ":dataforge-data"
-include ":dataforge-io"
-
-include ":dataforge-tables"
-
-include ":dataforge-workspace"
-//include ":dataforge-envelope"

settings.gradle.kts

@@ -0,0 +1,15 @@
+pluginManagement {
+    repositories {
+        jcenter()
+        maven("https://plugins.gradle.org/m2/")
+    }
+}
+
+//enableFeaturePreview("GRADLE_METADATA")
+
+rootProject.name = "dataforge-core"
+include(
+        ":dataforge-meta",
+        ":dataforge-meta-io",
+        ":dataforge-context"
+)