From b3dfe75154d2ba8810dd67b6c147677faffa2893 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 3 Feb 2021 20:13:22 +0300 Subject: [PATCH] 0.7.5; Update versions --- CHANGELOG.md | 4 +++ build.gradle.kts | 8 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../mipt/npm/gradle/KScienceNativePlugin.kt | 5 ++-- .../ru/mipt/npm/gradle/KScienceNodePlugin.kt | 25 +++++++++++++++---- .../ru/mipt/npm/gradle/KScienceVersions.kt | 9 ++++--- .../mipt/npm/gradle/SerializationTargets.kt | 11 -------- 7 files changed, 36 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d671386..e9f2715 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +- Ktor version to versions ### Changed +- Kotlin to 1.4.30 stable +- Added intermediate jsCommon main/test sourcesSet for node plugin ### Deprecated ### Removed +- kaml ### Fixed diff --git a/build.gradle.kts b/build.gradle.kts index c06e675..d6b7caa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.7.4" +version = "0.7.5" repositories { gradlePluginPortal() @@ -16,7 +16,7 @@ repositories { maven("https://dl.bintray.com/kotlin/kotlin-dev") } -val kotlinVersion = "1.4.30-RC" +val kotlinVersion = "1.4.30" java { targetCompatibility = JavaVersion.VERSION_1_8 @@ -26,11 +26,11 @@ java { dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") implementation("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion") - implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.15.0") + implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.15.1") implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.20") implementation("org.jetbrains.dokka:dokka-base:1.4.20") implementation("org.jetbrains.intellij.plugins:gradle-changelog-plugin:1.0.0") - implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.2.4") + implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.4.0") } gradlePlugin { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d9ca16..28ff446 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNativePlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceNativePlugin.kt index d98a161..2eaeb6e 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNativePlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceNativePlugin.kt @@ -39,14 +39,13 @@ class KScienceNativePlugin : Plugin { sourceSets{ val commonMain by getting + val commonTest by getting + val nativeMain by creating{ dependsOn(commonMain) } - val commonTest by getting - val nativeTest by creating{ - //dependsOn(nativeMain) dependsOn(commonTest) } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt index 473424e..e1367bc 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt @@ -26,18 +26,33 @@ class KScienceNodePlugin : Plugin { } sourceSets { val commonMain by getting - val nodeMain by creating { + val commonTest by getting + + val jsCommonMain by creating{ dependsOn(commonMain) + } + + val jsCommonTest by creating{ + dependsOn(commonTest) + } + + val jsMain by getting{ + dependsOn(jsCommonMain) + } + + val jsTest by getting{ + dependsOn(jsCommonTest) + } + + val nodeMain by creating { + dependsOn(jsCommonMain) dependencies{ api("org.jetbrains.kotlinx:kotlinx-nodejs:${KScienceVersions.kotlinxNodeVersion}") } } - val commonTest by getting - val nodeTest by creating { - dependsOn(nodeMain) - dependsOn(commonTest) + dependsOn(jsCommonTest) } } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index 8e1486e..be90f41 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -6,17 +6,18 @@ import org.gradle.api.JavaVersion * Build constants */ object KScienceVersions { - const val kotlinVersion = "1.4.21" + const val kotlinVersion = "1.4.30" const val kotlinxNodeVersion = "0.0.7" const val coroutinesVersion = "1.4.2" - const val serializationVersion = "1.0.1" - const val atomicVersion = "0.14.4" + const val serializationVersion = "1.1.0-RC" + const val atomicVersion = "0.15.1" + const val ktorVersion = "1.5.1" val JVM_TARGET = JavaVersion.VERSION_11 object Serialization{ const val xmlVersion = "0.80.1" const val bsonVersion = "0.4.4" - const val yamlKtVersion = "0.7.6" + const val yamlKtVersion = "0.8.0" } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt index 1f66db2..f9972d3 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt @@ -54,17 +54,6 @@ class SerializationTargets( ) } - @Deprecated("Use multiplatform yamlKt instead") - fun Project.yaml( - version: String = KScienceVersions.Serialization.yamlVersion - ) { - useDependency( - "jvm" to "com.charleskorn.kaml:kaml:$version", - dependencySourceSet = sourceSet, - dependencyConfiguration = configuration - ) - } - fun Project.yamlKt( version: String = KScienceVersions.Serialization.yamlKtVersion ) {