Skip to content

Commit

Permalink
update to kotlin 1.9.22 and atrium 1.2.0-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
robstoll committed Mar 3, 2024
1 parent e8263f4 commit 24cacf3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 428 deletions.
11 changes: 6 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.StandardCopyOption

buildscript {
// needs to be defined in here because otherwise tutteli-publish plugin does not have this information when applied
// and we want that it to apply ch.tutteli conventions
// and we want that it to apply the ch.tutteli conventions
rootProject.version = "1.0.0"
rootProject.group = "ch.tutteli.kbox"
rootProject.description = "A utility library for Kotlin "
}

plugins {
kotlin("multiplatform") version "1.8.22"
kotlin("multiplatform") version "1.9.22"
id("org.jetbrains.dokka") version "1.9.10"
val tutteliGradleVersion = "5.0.1"
id("ch.tutteli.gradle.plugins.dokka") version tutteliGradleVersion
Expand All @@ -22,7 +23,7 @@ plugins {
id("io.gitlab.arturbosch.detekt") version "1.23.5"
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
}
val atriumVersion by extra("1.1.0-IR-alpha")
val atriumVersion by extra("1.2.0-RC1")
val spekVersion by extra("2.0.15")

the<ch.tutteli.gradle.plugins.junitjacoco.JunitJacocoPluginExtension>()
Expand Down Expand Up @@ -79,7 +80,7 @@ val detektTasks = tasks.withType<io.gitlab.arturbosch.detekt.Detekt>()

fun Task.reportXml(): Path {
val fileName = if (name == "detekt") "detekt" else name.substring("detekt".length)
return project.buildDir.resolve("reports/detekt/$fileName.xml").toPath()
return project.layout.buildDirectory.file("reports/detekt/$fileName.xml").get().asFile.toPath()
}

// not provided by detekt itself so far, might change in the future
Expand All @@ -106,7 +107,7 @@ detektTasks.forEach {
it.doLast {
// necessary as currently detekt writes main.xml for each platform and overrides when doing so
Files.move(
project.buildDir.resolve("reports/detekt/main.xml").toPath(),
project.project.layout.buildDirectory.file("reports/detekt/main.xml").get().asFile.toPath(),
reportXml,
StandardCopyOption.REPLACE_EXISTING
)
Expand Down
Loading

0 comments on commit 24cacf3

Please sign in to comment.