Update dependencies.

This commit is contained in:
Oliver Rümpelein 2020-08-28 21:31:46 +02:00
parent 6d37da56b6
commit a9f4740f0c
4 changed files with 8 additions and 6 deletions

View file

@ -32,8 +32,6 @@ java {
} }
dependencies { dependencies {
implementation(kotlin("stdlib-jdk8"))
testImplementation( testImplementation(
group = "io.kotest", group = "io.kotest",
name = "kotest-runner-junit5-jvm", name = "kotest-runner-junit5-jvm",
@ -49,7 +47,6 @@ dependencies {
tasks { tasks {
withType<KotlinCompile>().configureEach { withType<KotlinCompile>().configureEach {
kotlinOptions { kotlinOptions {
// freeCompilerArgs = listOf("-XXLanguage:+InlineClasses")
apiVersion = getFromExtra("kotlinApiVersion") apiVersion = getFromExtra("kotlinApiVersion")
languageVersion = getFromExtra("kotlinApiVersion") languageVersion = getFromExtra("kotlinApiVersion")
jvmTarget = getFromExtra<JavaVersion>("javaVersion").toString() jvmTarget = getFromExtra<JavaVersion>("javaVersion").toString()

View file

@ -13,6 +13,7 @@ module rcdbquery.main {
exports de.pheerai.rcdbquery.dataMappings.type; exports de.pheerai.rcdbquery.dataMappings.type;
exports de.pheerai.rcdbquery.dataMappings.vendor; exports de.pheerai.rcdbquery.dataMappings.vendor;
exports de.pheerai.rcdbquery.dsl; exports de.pheerai.rcdbquery.dsl;
exports de.pheerai.rcdbquery.dsl.params;
requires kotlin.stdlib; requires kotlin.stdlib;
} }

View file

@ -5,3 +5,6 @@ import io.kotest.core.config.AbstractProjectConfig
class TestConfig : AbstractProjectConfig() { class TestConfig : AbstractProjectConfig() {
override val globalAssertSoftly = true override val globalAssertSoftly = true
} }
// Just for IJ to stop whining about unused classes
annotation class Spec()

View file

@ -1,5 +1,6 @@
package de.pheerai.rcdbquery.dsl package de.pheerai.rcdbquery.dsl
import de.pheerai.rcdbquery.Spec
import de.pheerai.rcdbquery.dataMappings.order.Order import de.pheerai.rcdbquery.dataMappings.order.Order
import de.pheerai.rcdbquery.dataMappings.order.sortBy import de.pheerai.rcdbquery.dataMappings.order.sortBy
import de.pheerai.rcdbquery.dataMappings.searchType.SearchType 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.dataMappings.vendor.vendors
import de.pheerai.rcdbquery.dsl.params.ParamAlreadySetException import de.pheerai.rcdbquery.dsl.params.ParamAlreadySetException
import io.kotest.assertions.asClue import io.kotest.assertions.asClue
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.core.spec.style.StringSpec import io.kotest.core.spec.style.StringSpec
import io.kotest.matchers.string.shouldContain import io.kotest.matchers.string.shouldContain
import io.kotest.matchers.string.shouldHaveLength import io.kotest.matchers.string.shouldHaveLength
import org.junit.jupiter.api.assertThrows
@Spec
class RcdbQueryDslTest : StringSpec({ class RcdbQueryDslTest : StringSpec({
"should generate a proper URL" { "should generate a proper URL" {
rcdbQuery { rcdbQuery {
@ -43,7 +45,7 @@ class RcdbQueryDslTest : StringSpec({
} }
"Should throw if unique value is reset" { "Should throw if unique value is reset" {
assertThrows<ParamAlreadySetException> { shouldThrow<ParamAlreadySetException> {
rcdbQuery { rcdbQuery {
searchType(SearchType.COASTER) searchType(SearchType.COASTER)
type { type {
@ -54,4 +56,3 @@ class RcdbQueryDslTest : StringSpec({
} }
} }
}) })