From cca2fdae8ef301f32a1ac78a6ab703c927620165 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 19 Nov 2019 22:30:50 +0300 Subject: [PATCH] roll back to junit4 remove io plugin magick --- build.gradle.kts | 4 ++-- src/main/kotlin/Scientifik.kt | 2 +- .../kotlin/scientifik/ScientifikExtension.kt | 24 +++++++++---------- .../kotlin/scientifik/ScientifikJVMPlugin.kt | 13 +++++----- .../kotlin/scientifik/ScientifikMPPlugin.kt | 13 +++++----- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3e9b0a4..132a63d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") diff --git a/src/main/kotlin/Scientifik.kt b/src/main/kotlin/Scientifik.kt index 078519b..7718b86 100644 --- a/src/main/kotlin/Scientifik.kt +++ b/src/main/kotlin/Scientifik.kt @@ -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" } diff --git a/src/main/kotlin/scientifik/ScientifikExtension.kt b/src/main/kotlin/scientifik/ScientifikExtension.kt index 975618e..022b7e6 100644 --- a/src/main/kotlin/scientifik/ScientifikExtension.kt +++ b/src/main/kotlin/scientifik/ScientifikExtension.kt @@ -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 diff --git a/src/main/kotlin/scientifik/ScientifikJVMPlugin.kt b/src/main/kotlin/scientifik/ScientifikJVMPlugin.kt index c8d12e8..23a6427 100644 --- a/src/main/kotlin/scientifik/ScientifikJVMPlugin.kt +++ b/src/main/kotlin/scientifik/ScientifikJVMPlugin.kt @@ -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 { 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 { } } } - tasks.withType(){ - useJUnitPlatform() - } +// tasks.withType(){ +// useJUnitPlatform() +// } } } diff --git a/src/main/kotlin/scientifik/ScientifikMPPlugin.kt b/src/main/kotlin/scientifik/ScientifikMPPlugin.kt index 8a6fbfa..2c4e218 100644 --- a/src/main/kotlin/scientifik/ScientifikMPPlugin.kt +++ b/src/main/kotlin/scientifik/ScientifikMPPlugin.kt @@ -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 { 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 { findByName("assemble")?.dependsOn(installJsDist) } - withType(){ - useJUnitPlatform() - } +// withType(){ +// useJUnitPlatform() +// } } }