From 2ef239ea4534edad253098ca068c5e34391a414a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= <oli_r@fg4f.de>
Date: Thu, 7 May 2020 10:32:32 +0200
Subject: [PATCH] Implement proper Java11 Library (modules and all)

---
 build.gradle.kts                                         | 9 +++------
 src/main/kotlin/de/pheerai/rcdbquery/Sample.kt           | 2 +-
 .../rcdbquery/dataMappings/internal/RcdbParamOption.kt   | 1 -
 .../pheerai/rcdbquery/dataMappings/page/paramBuilder.kt  | 5 +++--
 .../de/pheerai/rcdbquery/dataMappings/status/Status.kt   | 4 ++--
 src/main/kotlin/module-info.java                         | 3 +++
 6 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 src/main/kotlin/module-info.java

diff --git a/build.gradle.kts b/build.gradle.kts
index 9c9759d..24292aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
-    application
 }
 
 repositories {
@@ -17,14 +16,9 @@ java {
     sourceCompatibility = JavaVersion.VERSION_11
 }
 
-application {
-    mainClassName = "de.pheerai.rcdbquery.SampleKt"
-}
-
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
 
-//    testImplementation(kotlin("test-junit"))
     testImplementation("io.kotest:kotest-runner-junit5-jvm:4.0.5")
     testImplementation("io.kotest:kotest-assertions-core-jvm:4.0.5")
 }
@@ -33,6 +27,9 @@ tasks {
     withType<KotlinCompile>().configureEach {
         kotlinOptions {
             freeCompilerArgs = listOf("-XXLanguage:+InlineClasses")
+            apiVersion = "1.3"
+            languageVersion = "1.3"
+            jvmTarget = JavaVersion.VERSION_11.toString()
         }
     }
 
diff --git a/src/main/kotlin/de/pheerai/rcdbquery/Sample.kt b/src/main/kotlin/de/pheerai/rcdbquery/Sample.kt
index e95825b..1631acb 100644
--- a/src/main/kotlin/de/pheerai/rcdbquery/Sample.kt
+++ b/src/main/kotlin/de/pheerai/rcdbquery/Sample.kt
@@ -7,7 +7,7 @@ import de.pheerai.rcdbquery.dataMappings.searchType.SearchType
 import de.pheerai.rcdbquery.dataMappings.searchType.searchType
 import de.pheerai.rcdbquery.dataMappings.vendor.Vendor
 import de.pheerai.rcdbquery.dataMappings.vendor.vendors
-import de.pheerai.rcdbquery.dsl.*
+import de.pheerai.rcdbquery.dsl.rcdbQuery
 
 fun main() {
     println(generateNameQueryUrl())
diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/RcdbParamOption.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/RcdbParamOption.kt
index c681935..98f1ed6 100644
--- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/RcdbParamOption.kt
+++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/RcdbParamOption.kt
@@ -5,4 +5,3 @@ interface RcdbParamOption<out T> {
     val fullName: String
     val paramValue: T
 }
-
diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/paramBuilder.kt
index c7d4c62..325ca96 100644
--- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/paramBuilder.kt
+++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/paramBuilder.kt
@@ -2,6 +2,7 @@ package de.pheerai.rcdbquery.dataMappings.page
 
 import de.pheerai.rcdbquery.dsl.ParamsCollector
 
-fun ParamsCollector.page(page: Int) = also { this[Page.staticParamName] =
-    Page(page)
+fun ParamsCollector.page(page: Int) = also {
+    this[Page.staticParamName] =
+        Page(page)
 }
diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/Status.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/Status.kt
index e1a82f9..615245d 100644
--- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/Status.kt
+++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/Status.kt
@@ -8,7 +8,7 @@ enum class Status(
     override val fullName: String,
     override val paramValue: Int
 ) : RcdbParamOption<Int> {
-    SBNO("SBNO", "Standing, but not operating",  311),
+    SBNO("SBNO", "Standing, but not operating", 311),
     OPERATING("Operating", "In operation", 93),
     UNDER_CONSTRUCTION("Under Construction", 310),
     STORED("Stored", "In storage", 312)
@@ -19,7 +19,7 @@ enum class Status(
     companion object {
         const val staticParamName = "st"
 
-        fun of(input: String) = when(input) {
+        fun of(input: String) = when (input) {
             "SBNO" -> SBNO
             "Operating" -> OPERATING
             "Under Construction" -> UNDER_CONSTRUCTION
diff --git a/src/main/kotlin/module-info.java b/src/main/kotlin/module-info.java
new file mode 100644
index 0000000..c7a68dd
--- /dev/null
+++ b/src/main/kotlin/module-info.java
@@ -0,0 +1,3 @@
+module rcdbquery.main {
+    requires kotlin.stdlib;
+}