Implement proper Java11 Library (modules and all)

This commit is contained in:
Oliver Rümpelein 2020-05-07 10:32:32 +02:00
parent 1d2c7e1877
commit 2ef239ea45
6 changed files with 12 additions and 12 deletions

View file

@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
kotlin("jvm") kotlin("jvm")
application
} }
repositories { repositories {
@ -17,14 +16,9 @@ java {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11
} }
application {
mainClassName = "de.pheerai.rcdbquery.SampleKt"
}
dependencies { dependencies {
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))
// testImplementation(kotlin("test-junit"))
testImplementation("io.kotest:kotest-runner-junit5-jvm:4.0.5") testImplementation("io.kotest:kotest-runner-junit5-jvm:4.0.5")
testImplementation("io.kotest:kotest-assertions-core-jvm:4.0.5") testImplementation("io.kotest:kotest-assertions-core-jvm:4.0.5")
} }
@ -33,6 +27,9 @@ tasks {
withType<KotlinCompile>().configureEach { withType<KotlinCompile>().configureEach {
kotlinOptions { kotlinOptions {
freeCompilerArgs = listOf("-XXLanguage:+InlineClasses") freeCompilerArgs = listOf("-XXLanguage:+InlineClasses")
apiVersion = "1.3"
languageVersion = "1.3"
jvmTarget = JavaVersion.VERSION_11.toString()
} }
} }

View file

@ -7,7 +7,7 @@ import de.pheerai.rcdbquery.dataMappings.searchType.SearchType
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.Vendor
import de.pheerai.rcdbquery.dataMappings.vendor.vendors import de.pheerai.rcdbquery.dataMappings.vendor.vendors
import de.pheerai.rcdbquery.dsl.* import de.pheerai.rcdbquery.dsl.rcdbQuery
fun main() { fun main() {
println(generateNameQueryUrl()) println(generateNameQueryUrl())

View file

@ -5,4 +5,3 @@ interface RcdbParamOption<out T> {
val fullName: String val fullName: String
val paramValue: T val paramValue: T
} }

View file

@ -2,6 +2,7 @@ package de.pheerai.rcdbquery.dataMappings.page
import de.pheerai.rcdbquery.dsl.ParamsCollector import de.pheerai.rcdbquery.dsl.ParamsCollector
fun ParamsCollector.page(page: Int) = also { this[Page.staticParamName] = fun ParamsCollector.page(page: Int) = also {
Page(page) this[Page.staticParamName] =
Page(page)
} }

View file

@ -8,7 +8,7 @@ enum class Status(
override val fullName: String, override val fullName: String,
override val paramValue: Int override val paramValue: Int
) : RcdbParamOption<Int> { ) : RcdbParamOption<Int> {
SBNO("SBNO", "Standing, but not operating", 311), SBNO("SBNO", "Standing, but not operating", 311),
OPERATING("Operating", "In operation", 93), OPERATING("Operating", "In operation", 93),
UNDER_CONSTRUCTION("Under Construction", 310), UNDER_CONSTRUCTION("Under Construction", 310),
STORED("Stored", "In storage", 312) STORED("Stored", "In storage", 312)
@ -19,7 +19,7 @@ enum class Status(
companion object { companion object {
const val staticParamName = "st" const val staticParamName = "st"
fun of(input: String) = when(input) { fun of(input: String) = when (input) {
"SBNO" -> SBNO "SBNO" -> SBNO
"Operating" -> OPERATING "Operating" -> OPERATING
"Under Construction" -> UNDER_CONSTRUCTION "Under Construction" -> UNDER_CONSTRUCTION

View file

@ -0,0 +1,3 @@
module rcdbquery.main {
requires kotlin.stdlib;
}