Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions base/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import org.gradle.api.JavaVersion.VERSION_17
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm")
Expand All @@ -16,9 +15,10 @@ dependencies {
testImplementation(name = "spek-dsl-jvm", version = spekVersion, group = "org.spekframework.spek2")
testImplementation(name = "atrium-fluent-en_GB", version = "0.16.0", group = "ch.tutteli.atrium")
testRuntimeOnly(name = "spek-runner-junit5", version = spekVersion, group = "org.spekframework.spek2")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

Comment thread
jGleitz marked this conversation as resolved.
constraints {
testImplementation(kotlin("reflect", version = KotlinCompilerVersion.VERSION))
testImplementation(kotlin("reflect"))
}
}

Expand All @@ -29,23 +29,19 @@ java {

kotlin {
explicitApi()
}

tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "17"
freeCompilerArgs += "-Xopt-in=kotlin.io.path.ExperimentalPathApi"
compilerOptions {
jvmTarget = JvmTarget.JVM_17
}
}

tasks.withType<Test> {
useJUnitPlatform()

val testPwd = buildDir.resolve("test-pwd")
val testPwd = layout.buildDirectory.dir("test-pwd")
doFirst {
testPwd.mkdirs()
testPwd.get().asFile.mkdirs()
}
workingDir = testPwd
workingDir = testPwd.get().asFile
}


2 changes: 1 addition & 1 deletion base/src/main/kotlin/DefaultTestFiles.kt
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public class DefaultTestFiles: TestFiles {
private val unixInvalidCharacters get() = Regex("[/\u0000]")
private val windowsInvalidCharacters get() = Regex("[/\\\\<>:\"|?*\u0000]")
private val invalidFileNameCharacters by lazy(PUBLICATION) {
val osName = System.getProperty("os.name").toLowerCase()
val osName = System.getProperty("os.name").lowercase()
if (setOf("nix", "nux", "aix", "mac").any { osName.contains(it) }) unixInvalidCharacters
Comment thread
jGleitz marked this conversation as resolved.
else windowsInvalidCharacters // default to windows because it is the most restrictive
}
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id("org.jetbrains.dokka-javadoc") version "2.1.0" apply false
`maven-publish`
signing
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
idea
}

Expand Down Expand Up @@ -150,10 +150,10 @@ subprojects {
tasks.register("release") {
group = "release"
description = "Releases the project to all remote repositories"
dependsOn(publishToGithub, publishToMavenCentral, rootProject.tasks.closeAndReleaseStagingRepository)
dependsOn(publishToGithub, publishToMavenCentral, rootProject.tasks.closeAndReleaseStagingRepositories)
}

rootProject.tasks.closeAndReleaseStagingRepository { mustRunAfter(publishToMavenCentral) }
rootProject.tasks.closeAndReleaseStagingRepositories { mustRunAfter(publishToMavenCentral) }
}
}

Expand Down
19 changes: 5 additions & 14 deletions kotest/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import org.gradle.api.JavaVersion.VERSION_17
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm")
Expand All @@ -19,9 +18,10 @@ dependencies {

testImplementation(name = "kotest-runner-junit5", version = kotestVersion, group = "io.kotest")
testImplementation(name = "atrium-fluent-en_GB", version = "0.16.0", group = "ch.tutteli.atrium")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

Comment thread
jGleitz marked this conversation as resolved.
constraints {
testImplementation(kotlin("reflect", version = KotlinCompilerVersion.VERSION))
testImplementation(kotlin("reflect"))
}
}

Expand All @@ -32,17 +32,8 @@ java {

kotlin {
explicitApi()
}

tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "17"
}
}

tasks.compileTestKotlin {
kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlin.io.path.ExperimentalPathApi"
compilerOptions {
jvmTarget = JvmTarget.JVM_17
}
}

Expand Down
19 changes: 5 additions & 14 deletions spek/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import org.gradle.api.JavaVersion.VERSION_17
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm")
Expand All @@ -21,9 +20,10 @@ dependencies {
testImplementation(name = "spek-dsl-jvm", version = spekVersion, group = "org.spekframework.spek2")
testImplementation(name = "atrium-fluent-en_GB", version = "0.16.0", group = "ch.tutteli.atrium")
testRuntimeOnly(name = "spek-runner-junit5", version = spekVersion, group = "org.spekframework.spek2")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

Comment thread
jGleitz marked this conversation as resolved.
constraints {
testImplementation(kotlin("reflect", version = KotlinCompilerVersion.VERSION))
testImplementation(kotlin("reflect"))
}
}

Expand All @@ -34,17 +34,8 @@ java {

kotlin {
explicitApi()
}

tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "17"
}
}

tasks.compileTestKotlin {
kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlin.io.path.ExperimentalPathApi"
compilerOptions {
jvmTarget = JvmTarget.JVM_17
}
}

Expand Down
Loading