diff --git a/build.gradle.kts b/build.gradle.kts index a7db13a..b45d67b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,42 +1,33 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { - id("org.jetbrains.kotlin.multiplatform") + kotlin("jvm") + application } + repositories { mavenCentral() } -group = "com.example" + +group = "de.pheerai" version = "0.0.1" -apply(plugin = "maven-publish") - -kotlin { - jvm() - - sourceSets { - commonMain { - dependencies { - implementation(kotlin("stdlib-common")) - } - } - commonTest { - dependencies { - implementation(kotlin("test-common")) - implementation(kotlin("test-annotations-common")) - } - } - getByName("jvmMain") { - dependencies { - implementation(kotlin("stdlib-jdk8")) - } - } - getByName("jvmTest") { - dependencies { - implementation(kotlin("test")) - implementation(kotlin("test-junit")) - } - } - all { - languageSettings.enableLanguageFeature("InlineClasses") - } - } +java { + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 +} + +application { + mainClassName = "de.pheerai.rcdbquery.SampleKt" +} + +dependencies { + implementation(kotlin("stdlib-jdk8")) + + testImplementation(kotlin("test-junit")) +} + +val compileKotlin: KotlinCompile by tasks +compileKotlin.kotlinOptions { + freeCompilerArgs = listOf("-XXLanguage:+InlineClasses") } diff --git a/settings.gradle.kts b/settings.gradle.kts index 2ca4bbb..68d9b94 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ pluginManagement { plugins { - id("org.jetbrains.kotlin.multiplatform") version "1.3.61" + kotlin("jvm") version "1.3.72" } } diff --git a/src/jvmMain/kotlin/de/pheerai/rcdbquery/SampleJvm.kt b/src/jvmMain/kotlin/de/pheerai/rcdbquery/SampleJvm.kt deleted file mode 100644 index 9d7eab0..0000000 --- a/src/jvmMain/kotlin/de/pheerai/rcdbquery/SampleJvm.kt +++ /dev/null @@ -1,5 +0,0 @@ -package de.pheerai.rcdbquery - -fun main() { - print(generateQueryUrl()) -} diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/Sample.kt b/src/main/kotlin/de/pheerai/rcdbquery/Sample.kt similarity index 89% rename from src/commonMain/kotlin/de/pheerai/rcdbquery/Sample.kt rename to src/main/kotlin/de/pheerai/rcdbquery/Sample.kt index d506db1..6407f8e 100644 --- a/src/commonMain/kotlin/de/pheerai/rcdbquery/Sample.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/Sample.kt @@ -3,6 +3,10 @@ package de.pheerai.rcdbquery import de.pheerai.rcdbquery.dataMappings.* import de.pheerai.rcdbquery.dsl.* +fun main() { + print(generateQueryUrl()) +} + fun generateQueryUrl() = rcdbQuery { searchFor(SearchType.COASTER) searchTerm("Dragon") diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/Order.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/Order.kt similarity index 100% rename from src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/Order.kt rename to src/main/kotlin/de/pheerai/rcdbquery/dataMappings/Order.kt diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/RcdbParamOption.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/RcdbParamOption.kt similarity index 100% rename from src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/RcdbParamOption.kt rename to src/main/kotlin/de/pheerai/rcdbquery/dataMappings/RcdbParamOption.kt diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/RcdbQueryParams.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/RcdbQueryParams.kt similarity index 100% rename from src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/RcdbQueryParams.kt rename to src/main/kotlin/de/pheerai/rcdbquery/dataMappings/RcdbQueryParams.kt diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/SearchTerm.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/SearchTerm.kt similarity index 100% rename from src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/SearchTerm.kt rename to src/main/kotlin/de/pheerai/rcdbquery/dataMappings/SearchTerm.kt diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/SearchType.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/SearchType.kt similarity index 100% rename from src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/SearchType.kt rename to src/main/kotlin/de/pheerai/rcdbquery/dataMappings/SearchType.kt diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/Vendor.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/Vendor.kt similarity index 100% rename from src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/Vendor.kt rename to src/main/kotlin/de/pheerai/rcdbquery/dataMappings/Vendor.kt diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/dsl/rcdbQueryDsl.kt b/src/main/kotlin/de/pheerai/rcdbquery/dsl/rcdbQueryDsl.kt similarity index 100% rename from src/commonMain/kotlin/de/pheerai/rcdbquery/dsl/rcdbQueryDsl.kt rename to src/main/kotlin/de/pheerai/rcdbquery/dsl/rcdbQueryDsl.kt diff --git a/src/commonTest/kotlin/de/pheerai/rcdbquery/SampleTests.kt b/src/test/kotlin/de/pheerai/rcdbquery/SampleTests.kt similarity index 100% rename from src/commonTest/kotlin/de/pheerai/rcdbquery/SampleTests.kt rename to src/test/kotlin/de/pheerai/rcdbquery/SampleTests.kt diff --git a/src/jvmTest/kotlin/de/pheerai/rcdbquery/SampleTestsJVM.kt b/src/test/kotlin/de/pheerai/rcdbquery/SampleTestsJVM.kt similarity index 100% rename from src/jvmTest/kotlin/de/pheerai/rcdbquery/SampleTestsJVM.kt rename to src/test/kotlin/de/pheerai/rcdbquery/SampleTestsJVM.kt diff --git a/src/commonTest/kotlin/de/pheerai/rcdbquery/dsl/RcdbQueryDslTest.kt b/src/test/kotlin/de/pheerai/rcdbquery/dsl/RcdbQueryDslTest.kt similarity index 100% rename from src/commonTest/kotlin/de/pheerai/rcdbquery/dsl/RcdbQueryDslTest.kt rename to src/test/kotlin/de/pheerai/rcdbquery/dsl/RcdbQueryDslTest.kt