From a9f4740f0c666d21d934e3543d9dda51a7a3c313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= <oli_r@fg4f.de>
Date: Fri, 28 Aug 2020 21:31:46 +0200
Subject: [PATCH] Update dependencies.

---
 build.gradle.kts                                           | 3 ---
 src/main/kotlin/module-info.java                           | 1 +
 src/test/kotlin/de/pheerai/rcdbquery/TestConfig.kt         | 3 +++
 .../kotlin/de/pheerai/rcdbquery/dsl/RcdbQueryDslTest.kt    | 7 ++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3a270b6..62476da 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,8 +32,6 @@ java {
 }
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-
     testImplementation(
         group = "io.kotest",
         name = "kotest-runner-junit5-jvm",
@@ -49,7 +47,6 @@ dependencies {
 tasks {
     withType<KotlinCompile>().configureEach {
         kotlinOptions {
-//            freeCompilerArgs = listOf("-XXLanguage:+InlineClasses")
             apiVersion = getFromExtra("kotlinApiVersion")
             languageVersion = getFromExtra("kotlinApiVersion")
             jvmTarget = getFromExtra<JavaVersion>("javaVersion").toString()
diff --git a/src/main/kotlin/module-info.java b/src/main/kotlin/module-info.java
index 4025e2e..94ec0e1 100644
--- a/src/main/kotlin/module-info.java
+++ b/src/main/kotlin/module-info.java
@@ -13,6 +13,7 @@ module rcdbquery.main {
     exports de.pheerai.rcdbquery.dataMappings.type;
     exports de.pheerai.rcdbquery.dataMappings.vendor;
     exports de.pheerai.rcdbquery.dsl;
+    exports de.pheerai.rcdbquery.dsl.params;
 
     requires kotlin.stdlib;
 }
diff --git a/src/test/kotlin/de/pheerai/rcdbquery/TestConfig.kt b/src/test/kotlin/de/pheerai/rcdbquery/TestConfig.kt
index c333aae..b20ef87 100644
--- a/src/test/kotlin/de/pheerai/rcdbquery/TestConfig.kt
+++ b/src/test/kotlin/de/pheerai/rcdbquery/TestConfig.kt
@@ -5,3 +5,6 @@ import io.kotest.core.config.AbstractProjectConfig
 class TestConfig : AbstractProjectConfig() {
     override val globalAssertSoftly = true
 }
+
+// Just for IJ to stop whining about unused classes
+annotation class Spec()
diff --git a/src/test/kotlin/de/pheerai/rcdbquery/dsl/RcdbQueryDslTest.kt b/src/test/kotlin/de/pheerai/rcdbquery/dsl/RcdbQueryDslTest.kt
index 71ab8e1..e79449d 100644
--- a/src/test/kotlin/de/pheerai/rcdbquery/dsl/RcdbQueryDslTest.kt
+++ b/src/test/kotlin/de/pheerai/rcdbquery/dsl/RcdbQueryDslTest.kt
@@ -1,5 +1,6 @@
 package de.pheerai.rcdbquery.dsl
 
+import de.pheerai.rcdbquery.Spec
 import de.pheerai.rcdbquery.dataMappings.order.Order
 import de.pheerai.rcdbquery.dataMappings.order.sortBy
 import de.pheerai.rcdbquery.dataMappings.searchType.SearchType
@@ -10,11 +11,12 @@ import de.pheerai.rcdbquery.dataMappings.vendor.Vendor
 import de.pheerai.rcdbquery.dataMappings.vendor.vendors
 import de.pheerai.rcdbquery.dsl.params.ParamAlreadySetException
 import io.kotest.assertions.asClue
+import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.string.shouldContain
 import io.kotest.matchers.string.shouldHaveLength
-import org.junit.jupiter.api.assertThrows
 
+@Spec
 class RcdbQueryDslTest : StringSpec({
     "should generate a proper URL" {
         rcdbQuery {
@@ -43,7 +45,7 @@ class RcdbQueryDslTest : StringSpec({
     }
 
     "Should throw if unique value is reset" {
-        assertThrows<ParamAlreadySetException> {
+        shouldThrow<ParamAlreadySetException> {
             rcdbQuery {
                 searchType(SearchType.COASTER)
                 type {
@@ -54,4 +56,3 @@ class RcdbQueryDslTest : StringSpec({
         }
     }
 })
-