updated folder structure

Author: Victor Harlan D. Lacson

build.gradle.kts

@@ -173,6 +173,6 @@ tasks.jacocoTestReport {
 
     reports {
         xml.isEnabled = true
-        html.isEnabled = false
+        html.isEnabled = true
     }
 }

build.gradle.kts.back

@@ -0,0 +1,128 @@
+plugins {
+    kotlin("multiplatform") version "1.4.0"
+    id("maven-publish")
+    id("org.jetbrains.dokka").version("0.9.18")
+    id("com.jfrog.bintray") version "1.8.5"
+    id("java-library")
+    jacoco
+}
+
+val kotlinVersion = "1.4.0"
+val csvVersion = "0.11.0"
+
+group = "com.vhl.blackmo"
+version = "0.4.1"
+
+repositories {
+    jcenter()
+}
+
+val dokkaJar = task<Jar>("dokkaJar") {
+    group = JavaBasePlugin.DOCUMENTATION_GROUP
+    archiveClassifier.set("javadoc")
+}
+val sourceJar = task<Jar>("sourceJar") {
+    archiveClassifier.set("sources")
+    from(sourceSets.getByName("main").allSource)
+}
+val metadata = task<Jar>("metadata") {
+    archiveClassifier.set("metadata")
+    from(sourceSets.getByName("main").allSource)
+}
+
+val jvm = task<Jar>("jvm") {
+    archiveClassifier.set("jvm")
+    from(sourceSets.getByName("main").allSource)
+}
+
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+                noReflect = false
+            }
+        }
+    }
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-common"))
+                implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
+            }
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test-annotations-common"))
+            }
+        }
+        jvm().compilations["main"].defaultSourceSet {
+            dependencies {
+                implementation(kotlin("stdlib-common"))
+            }
+        }
+        jvm().compilations["test"].defaultSourceSet {
+            this.
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
+                implementation("io.kotlintest:kotlintest-runner-junit5:3.3.2")
+                implementation("com.github.doyaaaaaken:kotlin-csv-jvm:$csvVersion")
+            }
+        }
+    }
+}
+
+val bintrayUser = (project.findProperty("bintray.user") ?: "").toString()
+val bintrayKey = (project.findProperty("bintray.apikey")?: "").toString()
+
+publishing {
+    repositories {
+        maven(url = "https://api.bintray.com/maven/blackmo18/kotlin-libraries/kotlin-grass/;publish=1") {
+            name = "bintray"
+            credentials {
+                username = bintrayUser
+                password = bintrayKey
+            }
+        }
+    }
+}
+
+val jvmTest by tasks.getting(Test::class) {
+    useJUnitPlatform { }
+}
+
+jacoco {
+    toolVersion = "0.8.5"
+}
+
+tasks.jacocoTestReport {
+    val coverageSourceDirs = arrayOf(
+            "src/commonMain",
+            "src/jvmMain"
+    )
+
+    val classFiles = File("${buildDir}/classes/kotlin/jvm/")
+            .walkBottomUp()
+            .toSet()
+            .filter { it.isFile }
+            .filterNot {
+                val fileNamePath = it.absolutePath
+                val dir = fileNamePath.substring(0, fileNamePath.lastIndexOf(File.separator))
+                dir.contains("com/vhl/blackmo/grass/data")
+            }
+
+    classDirectories.setFrom(classFiles)
+    sourceDirectories.setFrom(files(coverageSourceDirs))
+    additionalSourceDirs.setFrom(files(coverageSourceDirs))
+
+
+    executionData
+            .setFrom(files("${buildDir}/jacoco/jvmTest.exec"))
+
+    reports {
+        xml.isEnabled = true
+        html.isEnabled = false
+    }
+}

core/src/commonTest/kotlin/com/vhl/blackmo/grass/core/CustomDataTypeTest.kt

@@ -17,8 +17,8 @@
    c.  Add the mapping into the `mapTypes` including the null value
 
 ```kotlin
- object Java8DateTime: DataTypes {
-   
+ object Java8DateTime: DateTimeTypes() {
+   // for this example DateTimeTypes extends DataTypes
    // transforms functions
    override val formatDate = fun (value: String): Any? {
       val dateFormatter = DateTimeFormatter.ofPattern(DateTimeFormats.dateFormat)

core/src/commonTest/kotlin/com/vhl/blackmo/grass/core/TestCustomDataTypes.kt

@@ -161,7 +161,7 @@ tasks.jacocoTestReport {
         .filterNot {
             val fileNamePath = it.absolutePath
             val dir = fileNamePath.substring(0, fileNamePath.lastIndexOf(File.separator))
-            dir.contains("io/github/blackmo18/grass/data")
+            dir.contains("io/github/blackmo18/grass/core/PrimitiveType.kt")
         }
 
     classDirectories.setFrom(classFiles)
@@ -173,6 +173,6 @@ tasks.jacocoTestReport {
 
     reports {
         xml.isEnabled = true
-        html.isEnabled = false
+        html.isEnabled = true
     }
 }

docs/CustomDataType.MD

@@ -1,4 +1,4 @@
-package com.vhl.blackmo.grass.core
+package io.blackmo18.kotlin.grass.core
 
 import kotlin.reflect.KType