Skip to content

Commit 28f5293

Browse files
committed
updated kotest
1 parent 8fb0f92 commit 28f5293

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

build.gradle.kts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ plugins {
55
}
66

77
val moduleName = "com.github.kotlin_graphics.kotlin_unsigned"
8-
val kot = "org.jetbrains.kotlin:kotlin"
9-
val kotlintest_version = "4.0.5"
8+
val kotestVersion = "4.0.5"
109

1110
repositories {
1211
mavenCentral()
@@ -23,7 +22,7 @@ dependencies {
2322
components { withModule<ModularKotlinRule>(kotlin("stdlib-jdk8")) }
2423

2524
listOf("runner-junit5", "assertions-core"/*, "property"*/).forEach {
26-
testImplementation("io.kotest:kotest-$it-jvm:$kotlintest_version")
25+
testImplementation("io.kotest:kotest-$it-jvm:$kotestVersion")
2726
}
2827
}
2928

@@ -81,18 +80,15 @@ tasks.compileJava {
8180
options.compilerArgs = listOf("--patch-module", "$moduleName=${sourceSets.main.get().output.asPath}")
8281
}
8382

84-
tasks.withType<Test> {
85-
useJUnitPlatform()
86-
}
83+
tasks.withType<Test> { useJUnitPlatform() }
8784

8885
// == Add access to the 'modular' variant of kotlin("stdlib"): Put this into a buildSrc plugin and reuse it in all your subprojects
8986
configurations.all {
90-
if (name.toLowerCase().endsWith("compileclasspath") || name.toLowerCase().endsWith("runtimeclasspath")) {
87+
val n = name.toLowerCase()
88+
if (n.endsWith("compileclasspath") || n.endsWith("runtimeclasspath"))
9189
attributes.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named("modular-jar"))
92-
}
93-
if (name.toLowerCase().endsWith("compile") || name.toLowerCase().endsWith("runtime")) {
90+
if (n.endsWith("compile") || n.endsWith("runtime"))
9491
isCanBeConsumed = false
95-
}
9692
}
9793

9894
abstract class ModularJarCompatibilityRule : AttributeCompatibilityRule<LibraryElements> {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip

0 commit comments

Comments
 (0)