Merge pull request #29 from doyaaaaaken/issue-15

Multiplatform Setting
jsoizo · Sep 7, 2019 · a4cfd5d · a4cfd5d
2 parents 813b6c5 + dc32508
commit a4cfd5d
Show file tree

Hide file tree

Showing 37 changed files with 125 additions and 94 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,6 +24,5 @@ jobs:
 
       - run:
           command: |
-            ./gradlew test
-            ./gradlew jacocoTestReport
+            ./gradlew check
             bash <(curl -s https://codecov.io/bash)
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,12 @@
 plugins {
-    id("org.jetbrains.kotlin.jvm").version("1.3.41")
+    kotlin("multiplatform") version "1.3.50"
     id("org.jetbrains.dokka").version("0.9.18")
-    jacoco
     `maven-publish`
     signing
 }
 
 group = "com.github.doyaaaaaken"
-version = "0.6.1"
+version = "0.7.0"
 
 buildscript {
     repositories {
@@ -22,64 +21,107 @@ repositories {
     jcenter()
 }
 
-val test by tasks.getting(Test::class) {
-    useJUnitPlatform { }
+kotlin {
+    jvm {
+        val main by compilations.getting {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-common"))
+            }
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test-common"))
+                implementation(kotlin("test-annotations-common"))
+            }
+        }
+
+        jvm().compilations["main"].defaultSourceSet {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
+                implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+            }
+        }
+        jvm().compilations["test"].defaultSourceSet {
+            dependencies {
+                implementation("io.kotlintest:kotlintest-runner-junit5:3.3.2")
+            }
+        }
+    }
 }
 
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    testImplementation("io.kotlintest:kotlintest-runner-junit5:3.3.2")
+val jvmTest by tasks.getting(Test::class) {
+    useJUnitPlatform { }
 }
 
+////publishing settings
+////https://docs.gradle.org/current/userguide/publishing_maven.html
+//val sourcesJar = task<Jar>("sourcesJar") {
+//    from(sourceSets.main.get().allSource)
+//    archiveClassifier.set("sources")
+//}
+//val dokkaJar = task<Jar>("dokkaJar") {
+//    group = JavaBasePlugin.DOCUMENTATION_GROUP
+//    archiveClassifier.set("javadoc")
+//}
 
-//publishing settings
-//https://docs.gradle.org/current/userguide/publishing_maven.html
-val sourcesJar = task<Jar>("sourcesJar") {
-    from(sourceSets.main.get().allSource)
-    archiveClassifier.set("sources")
-}
-val dokkaJar = task<Jar>("dokkaJar") {
-    group = JavaBasePlugin.DOCUMENTATION_GROUP
-    archiveClassifier.set("javadoc")
-}
 
 publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifactId = "kotlin-csv"
-            from(components["java"])
-            artifacts {
-                artifact(sourcesJar)
-                artifact(dokkaJar)
-            }
-            pom {
-                name.set("kotlin-csv")
-                description.set("Kotlin CSV Reader/Writer")
-                url.set("https://github.com/doyaaaaaken/kotlin-csv")
+    //    publications["jvm"].apply {
+    //            artifactId = "kotlin-csv"
+//            from(components["java"])
+//        (this as MavenPublication).setArtifacts(dokkaJar)
 
-                organization {
-                    name.set("com.github.doyaaaaaken")
-                    url.set("https://github.com/doyaaaaaken")
-                }
-                licenses {
-                    license {
-                        name.set("Apache License 2.0")
-                        url.set("https://github.com/doyaaaaaken/kotlin-csv/blob/master/LICENSE")
-                    }
-                }
-                scm {
-                    url.set("https://github.com/doyaaaaaken/kotlin-csv")
-                    connection.set("scm:git:git://github.com/doyaaaaaken/kotlin-csv.git")
-                    developerConnection.set("https://github.com/doyaaaaaken/kotlin-csv")
+//        artifacts {
+//            artifact(sourcesJar)
+//            artifact(dokkaJar)
+//        }
+//    }
+    publications.all {
+        (this as MavenPublication).pom {
+            name.set("kotlin-csv")
+            description.set("Kotlin CSV Reader/Writer")
+            url.set("https://github.com/doyaaaaaken/kotlin-csv")
+
+            organization {
+                name.set("com.github.doyaaaaaken")
+                url.set("https://github.com/doyaaaaaken")
+            }
+            licenses {
+                license {
+                    name.set("Apache License 2.0")
+                    url.set("https://github.com/doyaaaaaken/kotlin-csv/blob/master/LICENSE")
                 }
-                developers {
-                    developer {
-                        name.set("doyaaaaaken")
-                    }
+            }
+            scm {
+                url.set("https://github.com/doyaaaaaken/kotlin-csv")
+                connection.set("scm:git:git://github.com/doyaaaaaken/kotlin-csv.git")
+                developerConnection.set("https://github.com/doyaaaaaken/kotlin-csv")
+            }
+            developers {
+                developer {
+                    name.set("doyaaaaaken")
                 }
             }
         }
     }
+//    publications {
+//        create<MavenPublication>("mavenJava") {
+//            artifactId = "kotlin-csv"
+//            from(components["java"])
+//            artifacts {
+//                artifact(sourcesJar)
+//                artifact(dokkaJar)
+//            }
+//        }
+//    }
     repositories {
         maven {
             credentials {
@@ -97,13 +139,5 @@ publishing {
 }
 
 signing {
-    sign(publishing.publications["mavenJava"])
-}
-
-tasks.withType<JacocoReport> {
-    reports {
-        xml.isEnabled = true
-        xml.destination = File("$buildDir/reports/jacoco/report.xml")
-        html.isEnabled = false
-    }
+    sign(publishing.publications)
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1 +1,2 @@
 rootProject.name = "kotlin-csv"
+enableFeaturePreview("GRADLE_METADATA")
diff --git a/...doyaaaaaken/kotlincsv/parser/CsvParser.kt → ...doyaaaaaken/kotlincsv/parser/CsvParser.kt b/...doyaaaaaken/kotlincsv/parser/CsvParser.kt → ...doyaaaaaken/kotlincsv/parser/CsvParser.kt
diff --git a/...ken/kotlincsv/parser/ParseStateMachine.kt → ...ken/kotlincsv/parser/ParseStateMachine.kt b/...ken/kotlincsv/parser/ParseStateMachine.kt → ...ken/kotlincsv/parser/ParseStateMachine.kt
@@ -1,7 +1,6 @@
 package com.github.doyaaaaaken.kotlincsv.parser
 
 import com.github.doyaaaaaken.kotlincsv.util.MalformedCSVException
-import java.util.*
 
 /**
  * @author doyaaaaaaken
@@ -16,7 +15,7 @@ internal class ParseStateMachine(
 
     private var state = ParseState.START
 
-    private val fields = Vector<String>()
+    private val fields = ArrayList<String>()
 
     private var field = StringBuilder()
 

diff --git a/...ithub/doyaaaaaken/kotlincsv/util/Const.kt → ...ithub/doyaaaaaken/kotlincsv/util/Const.kt b/...ithub/doyaaaaaken/kotlincsv/util/Const.kt → ...ithub/doyaaaaaken/kotlincsv/util/Const.kt
@@ -6,5 +6,5 @@ package com.github.doyaaaaaken.kotlincsv.util
  * @author doyaaaaaken
  */
 internal object Const {
-    val defaultCharset = Charsets.UTF_8
+    val defaultCharset = "UTF-8"
 }
diff --git a/...oyaaaaaken/kotlincsv/util/CsvDslMarker.kt → ...oyaaaaaken/kotlincsv/util/CsvDslMarker.kt b/...oyaaaaaken/kotlincsv/util/CsvDslMarker.kt → ...oyaaaaaken/kotlincsv/util/CsvDslMarker.kt
diff --git a/...n/kotlincsv/util/MalformedCSVException.kt → ...n/kotlincsv/util/MalformedCSVException.kt b/...n/kotlincsv/util/MalformedCSVException.kt → ...n/kotlincsv/util/MalformedCSVException.kt
@@ -1,7 +1,5 @@
 package com.github.doyaaaaaken.kotlincsv.util
 
-import java.lang.RuntimeException
-
 /**
  * @author doyaaaaaken
  */

diff --git a/...en/kotlincsv/client/BufferedLineReader.kt → ...en/kotlincsv/client/BufferedLineReader.kt b/...en/kotlincsv/client/BufferedLineReader.kt → ...en/kotlincsv/client/BufferedLineReader.kt
diff --git a/...aaaaken/kotlincsv/client/CsvFileReader.kt → ...aaaaken/kotlincsv/client/CsvFileReader.kt b/...aaaaken/kotlincsv/client/CsvFileReader.kt → ...aaaaken/kotlincsv/client/CsvFileReader.kt
diff --git a/...aaaaken/kotlincsv/client/CsvFileWriter.kt → ...aaaaken/kotlincsv/client/CsvFileWriter.kt b/...aaaaken/kotlincsv/client/CsvFileWriter.kt → ...aaaaken/kotlincsv/client/CsvFileWriter.kt
diff --git a/...doyaaaaaken/kotlincsv/client/CsvReader.kt → ...doyaaaaaken/kotlincsv/client/CsvReader.kt b/...doyaaaaaken/kotlincsv/client/CsvReader.kt → ...doyaaaaaken/kotlincsv/client/CsvReader.kt
@@ -5,6 +5,7 @@ import com.github.doyaaaaaken.kotlincsv.dsl.context.ICsvReaderContext
 import java.io.BufferedReader
 import java.io.File
 import java.io.InputStream
+import java.nio.charset.Charset
 
 /**
  * CSV Reader class
@@ -15,13 +16,15 @@ class CsvReader(
         private val ctx: CsvReaderContext = CsvReaderContext()
 ) : ICsvReaderContext by ctx {
 
+    private val charsetCode = Charset.forName(charset)
+
     /**
      * read csv data as String, and convert into List<List<String>>
      *
      * No need to close InputStream when calling this method.
      */
     fun readAll(data: String): List<List<String>> {
-        val br = data.byteInputStream(charset).bufferedReader(charset)
+        val br = data.byteInputStream(charsetCode).bufferedReader(charsetCode)
         return open(br) { readAll() }
     }
 
@@ -31,7 +34,7 @@ class CsvReader(
      * No need to close InputStream when calling this method.
      */
     fun readAll(file: File): List<List<String>> {
-        val br = file.inputStream().bufferedReader(charset)
+        val br = file.inputStream().bufferedReader(charsetCode)
         return open(br) { readAll() }
     }
 
@@ -41,7 +44,7 @@ class CsvReader(
      * No need to close InputStream when calling this method.
      */
     fun readAll(ips: InputStream): List<List<String>> {
-        val br = ips.bufferedReader(charset)
+        val br = ips.bufferedReader(charsetCode)
         return open(br) { readAll() }
     }
 
@@ -51,7 +54,7 @@ class CsvReader(
      * No need to close InputStream when calling this method.
      */
     fun readAllWithHeader(data: String): List<Map<String, String>> {
-        val br = data.byteInputStream(charset).bufferedReader(charset)
+        val br = data.byteInputStream(charsetCode).bufferedReader(charsetCode)
         return open(br) { readAllWithHeader() }
     }
 
@@ -61,7 +64,7 @@ class CsvReader(
      * No need to close InputStream when calling this method.
      */
     fun readAllWithHeader(file: File): List<Map<String, String>> {
-        val br = file.inputStream().bufferedReader(charset)
+        val br = file.inputStream().bufferedReader(charsetCode)
         return open(br) { readAllWithHeader() }
     }
 
@@ -71,7 +74,7 @@ class CsvReader(
      * No need to close InputStream when calling this method.
      */
     fun readAllWithHeader(ips: InputStream): List<Map<String, String>> {
-        val br = ips.bufferedReader(charset)
+        val br = ips.bufferedReader(charsetCode)
         return open(br) { readAllWithHeader() }
     }
 
@@ -104,7 +107,7 @@ class CsvReader(
      * @see open method
      */
     fun <T> open(file: File, read: CsvFileReader.() -> T): T {
-        val br = file.inputStream().bufferedReader(charset)
+        val br = file.inputStream().bufferedReader(charsetCode)
         return open(br, read)
     }
 
@@ -118,7 +121,7 @@ class CsvReader(
      * @see open method
      */
     fun <T> open(ips: InputStream, read: CsvFileReader.() -> T): T {
-        val br = ips.bufferedReader(charset)
+        val br = ips.bufferedReader(charsetCode)
         return open(br, read)
     }
 

diff --git a/...doyaaaaaken/kotlincsv/client/CsvWriter.kt → ...doyaaaaaken/kotlincsv/client/CsvWriter.kt b/...doyaaaaaken/kotlincsv/client/CsvWriter.kt → ...doyaaaaaken/kotlincsv/client/CsvWriter.kt
diff --git a/...doyaaaaaken/kotlincsv/dsl/CsvReaderDsl.kt → ...doyaaaaaken/kotlincsv/dsl/CsvReaderDsl.kt b/...doyaaaaaken/kotlincsv/dsl/CsvReaderDsl.kt → ...doyaaaaaken/kotlincsv/dsl/CsvReaderDsl.kt
diff --git a/...doyaaaaaken/kotlincsv/dsl/CsvWriterDsl.kt → ...doyaaaaaken/kotlincsv/dsl/CsvWriterDsl.kt b/...doyaaaaaken/kotlincsv/dsl/CsvWriterDsl.kt → ...doyaaaaaken/kotlincsv/dsl/CsvWriterDsl.kt
diff --git a/...kotlincsv/dsl/context/CsvReaderContext.kt → ...kotlincsv/dsl/context/CsvReaderContext.kt b/...kotlincsv/dsl/context/CsvReaderContext.kt → ...kotlincsv/dsl/context/CsvReaderContext.kt
@@ -2,7 +2,6 @@ package com.github.doyaaaaaken.kotlincsv.dsl.context
 
 import com.github.doyaaaaaken.kotlincsv.util.Const
 import com.github.doyaaaaaken.kotlincsv.util.CsvDslMarker
-import java.nio.charset.Charset
 
 /**
  * Interface for CSV Reader settings
@@ -11,7 +10,7 @@ import java.nio.charset.Charset
  */
 @CsvDslMarker
 interface ICsvReaderContext {
-    val charset: Charset
+    val charset: String
     val quoteChar: Char
     val delimiter: Char
     val escapeChar: Char

diff --git a/...incsv/dsl/context/CsvWriteQuoteContext.kt → ...incsv/dsl/context/CsvWriteQuoteContext.kt b/...incsv/dsl/context/CsvWriteQuoteContext.kt → ...incsv/dsl/context/CsvWriteQuoteContext.kt
diff --git a/...kotlincsv/dsl/context/CsvWriterContext.kt → ...kotlincsv/dsl/context/CsvWriterContext.kt b/...kotlincsv/dsl/context/CsvWriterContext.kt → ...kotlincsv/dsl/context/CsvWriterContext.kt
@@ -2,7 +2,6 @@ package com.github.doyaaaaaken.kotlincsv.dsl.context
 
 import com.github.doyaaaaaken.kotlincsv.util.Const
 import com.github.doyaaaaaken.kotlincsv.util.CsvDslMarker
-import java.nio.charset.Charset
 
 /**
  * Interface for CSV Writer settings
@@ -11,7 +10,7 @@ import java.nio.charset.Charset
  */
 @CsvDslMarker
 interface ICsvWriterContext {
-    val charset: Charset
+    val charset: String
     val delimiter: Char
     val nullCode: String
     val lineTerminator: String

diff --git a/...otlincsv/client/BufferedLineReaderTest.kt → ...otlincsv/client/BufferedLineReaderTest.kt b/...otlincsv/client/BufferedLineReaderTest.kt → ...otlincsv/client/BufferedLineReaderTest.kt
diff --git a/...ken/kotlincsv/client/CsvFileWriterTest.kt → ...ken/kotlincsv/client/CsvFileWriterTest.kt b/...ken/kotlincsv/client/CsvFileWriterTest.kt → ...ken/kotlincsv/client/CsvFileWriterTest.kt
diff --git a/...aaaaken/kotlincsv/client/CsvReaderTest.kt → ...aaaaken/kotlincsv/client/CsvReaderTest.kt b/...aaaaken/kotlincsv/client/CsvReaderTest.kt → ...aaaaken/kotlincsv/client/CsvReaderTest.kt
@@ -1,11 +1,11 @@
 package com.github.doyaaaaaken.kotlincsv.client
 
-import io.kotlintest.shouldBe
 import io.kotlintest.specs.WordSpec
 import com.github.doyaaaaaken.kotlincsv.dsl.context.CsvReaderContext
 import com.github.doyaaaaaken.kotlincsv.dsl.csvReader
 import com.github.doyaaaaaken.kotlincsv.util.Const
 import com.github.doyaaaaaken.kotlincsv.util.MalformedCSVException
+import io.kotlintest.shouldBe
 import io.kotlintest.shouldThrow
 import java.io.File
 
@@ -22,13 +22,13 @@ class CsvReaderTest : WordSpec() {
             }
             "be created with CsvReaderContext argument" {
                 val context = CsvReaderContext().apply {
-                    charset = Charsets.ISO_8859_1
+                    charset = Charsets.ISO_8859_1.name()
                     quoteChar = '\''
                     delimiter = '\t'
                     escapeChar = '"'
                 }
                 val reader = CsvReader(context)
-                reader.charset shouldBe Charsets.ISO_8859_1
+                reader.charset shouldBe Charsets.ISO_8859_1.name()
                 reader.quoteChar shouldBe '\''
                 reader.delimiter shouldBe '\t'
                 reader.escapeChar shouldBe '"'
@@ -158,7 +158,7 @@ class CsvReaderTest : WordSpec() {
         }
 
         "open method (with fileName argument)" should {
-            val rows = csvReader().open("src/test/resources/testdata/csv/simple.csv") {
+            val rows = csvReader().open("src/jvmTest/resources/testdata/csv/simple.csv") {
                 readAll()
             }
             rows shouldBe listOf(listOf("a", "b", "c"), listOf("d", "e", "f"))
@@ -175,5 +175,5 @@ class CsvReaderTest : WordSpec() {
 }
 
 private fun readTestDataFile(fileName: String): File {
-    return File("src/test/resources/testdata/csv/$fileName")
+    return File("src/jvmTest/resources/testdata/csv/$fileName")
 }