roll back to junit4
remove io plugin magick
This commit is contained in:
parent
8071d33c44
commit
cca2fdae8e
@ -7,7 +7,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "scientifik"
|
||||
version = "0.2.4"
|
||||
version = "0.2.5"
|
||||
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
@ -23,7 +23,7 @@ dependencies {
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
implementation("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0")
|
||||
implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.13.2")
|
||||
implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.14.1")
|
||||
implementation("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
|
||||
implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.0")
|
||||
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.10.0")
|
||||
|
@ -5,6 +5,6 @@ object Scientifik {
|
||||
const val ioVersion = "0.1.15"
|
||||
const val coroutinesVersion = "1.3.2"
|
||||
const val atomicfuVersion = "0.12.11"
|
||||
const val serializationVersion = "0.13.0"
|
||||
const val serializationVersion = "0.14.0"
|
||||
const val JVM_VERSION = "11"
|
||||
}
|
||||
|
@ -64,18 +64,18 @@ open class ScientifikExtension {
|
||||
}
|
||||
}
|
||||
|
||||
fun Project.withIO() {
|
||||
applyMPPDependency(
|
||||
"commonMain" to "org.jetbrains.kotlinx:kotlinx-io:${Scientifik.ioVersion}",
|
||||
"jvmMain" to "org.jetbrains.kotlinx:kotlinx-io-jvm:${Scientifik.ioVersion}",
|
||||
"jsMain" to "org.jetbrains.kotlinx:kotlinx-io-js:${Scientifik.ioVersion}"
|
||||
)
|
||||
subprojects {
|
||||
scientifik.apply {
|
||||
withIO()
|
||||
}
|
||||
}
|
||||
}
|
||||
// fun Project.withIO() {
|
||||
// applyMPPDependency(
|
||||
// "commonMain" to "org.jetbrains.kotlinx:kotlinx-io:${Scientifik.ioVersion}",
|
||||
// "jvmMain" to "org.jetbrains.kotlinx:kotlinx-io-jvm:${Scientifik.ioVersion}",
|
||||
// "jsMain" to "org.jetbrains.kotlinx:kotlinx-io-js:${Scientifik.ioVersion}"
|
||||
// )
|
||||
// subprojects {
|
||||
// scientifik.apply {
|
||||
// withIO()
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
internal val Project.scientifik: ScientifikExtension
|
||||
|
@ -6,7 +6,6 @@ import org.gradle.api.plugins.JavaBasePlugin
|
||||
import org.gradle.api.publish.PublishingExtension
|
||||
import org.gradle.api.publish.maven.MavenPublication
|
||||
import org.gradle.api.tasks.bundling.Jar
|
||||
import org.gradle.api.tasks.testing.Test
|
||||
import org.gradle.kotlin.dsl.*
|
||||
import org.jetbrains.dokka.gradle.DokkaTask
|
||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
|
||||
@ -40,9 +39,9 @@ open class ScientifikJVMPlugin : Plugin<Project> {
|
||||
languageSettings.applySettings()
|
||||
dependencies {
|
||||
implementation(kotlin("test"))
|
||||
//implementation(kotlin("test-junit"))
|
||||
implementation(kotlin("test-junit5"))
|
||||
implementation("org.junit.jupiter:junit-jupiter:5.5.2")
|
||||
implementation(kotlin("test-junit"))
|
||||
// implementation(kotlin("test-junit5"))
|
||||
// implementation("org.junit.jupiter:junit-jupiter:5.5.2")
|
||||
}
|
||||
}
|
||||
|
||||
@ -88,9 +87,9 @@ open class ScientifikJVMPlugin : Plugin<Project> {
|
||||
}
|
||||
}
|
||||
}
|
||||
tasks.withType<Test>(){
|
||||
useJUnitPlatform()
|
||||
}
|
||||
// tasks.withType<Test>(){
|
||||
// useJUnitPlatform()
|
||||
// }
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -7,7 +7,6 @@ import org.gradle.api.publish.PublishingExtension
|
||||
import org.gradle.api.publish.maven.MavenPublication
|
||||
import org.gradle.api.tasks.Copy
|
||||
import org.gradle.api.tasks.bundling.Jar
|
||||
import org.gradle.api.tasks.testing.Test
|
||||
import org.gradle.kotlin.dsl.*
|
||||
import org.jetbrains.dokka.gradle.DokkaTask
|
||||
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
||||
@ -58,9 +57,9 @@ open class ScientifikMPPlugin : Plugin<Project> {
|
||||
val jvmTest by getting {
|
||||
dependencies {
|
||||
implementation(kotlin("test"))
|
||||
//implementation(kotlin("test-junit"))
|
||||
implementation(kotlin("test-junit5"))
|
||||
implementation("org.junit.jupiter:junit-jupiter:5.5.2")
|
||||
implementation(kotlin("test-junit"))
|
||||
// implementation(kotlin("test-junit5"))
|
||||
// implementation("org.junit.jupiter:junit-jupiter:5.5.2")
|
||||
}
|
||||
}
|
||||
val jsMain by getting {
|
||||
@ -140,9 +139,9 @@ open class ScientifikMPPlugin : Plugin<Project> {
|
||||
findByName("assemble")?.dependsOn(installJsDist)
|
||||
}
|
||||
|
||||
withType<Test>(){
|
||||
useJUnitPlatform()
|
||||
}
|
||||
// withType<Test>(){
|
||||
// useJUnitPlatform()
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user