From 470c79637d28def5eaedfc24b0d2752d1a35ee72 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 7 Apr 2021 11:13:23 +0300 Subject: [PATCH 1/6] Kotlin 1.5 --- CHANGELOG.md | 1 + build.gradle.kts | 4 ++-- src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt | 6 +++--- src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e0d3e3..bc31201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `publication.platform` changed to `publishing.platform` - Dokka version to `1.4.30` - `useDateTime` in extension +- Kotlin 1.5 ### Deprecated diff --git a/build.gradle.kts b/build.gradle.kts index 66fd477..47f10dc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.3" +version = "0.9.4" description = "Build tools for DataForge and kscience projects" @@ -20,7 +20,7 @@ repositories { maven("https://dl.bintray.com/kotlin/kotlin-dev") } -val kotlinVersion = "1.4.32" +val kotlinVersion = "1.5.0-M2" java { targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index 46f095f..9fa3180 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -6,13 +6,13 @@ import org.gradle.api.JavaVersion * Build constants */ object KScienceVersions { - const val kotlinVersion = "1.4.32" + const val kotlinVersion = "1.5.0-M2" const val kotlinxNodeVersion = "0.0.7" const val coroutinesVersion = "1.4.3" const val serializationVersion = "1.1.0" const val atomicVersion = "0.15.1" - const val ktorVersion = "1.5.2" - const val htmlVersion = "0.7.2" + const val ktorVersion = "1.5.3" + const val htmlVersion = "0.7.3" const val dateTimeVersion = "0.1.1" val JVM_TARGET = JavaVersion.VERSION_11 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt index 93071a2..74ec198 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt @@ -8,9 +8,9 @@ import org.gradle.kotlin.dsl.maven import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder internal fun LanguageSettingsBuilder.applySettings(): Unit { - languageVersion = "1.4" + languageVersion = "1.5" + apiVersion = "1.5" progressiveMode = true - enableLanguageFeature("InlineClasses") useExperimentalAnnotation("kotlin.Experimental") useExperimentalAnnotation("kotlin.ExperimentalUnsignedTypes") useExperimentalAnnotation("kotlin.ExperimentalStdlibApi") @@ -22,6 +22,7 @@ internal fun LanguageSettingsBuilder.applySettings(): Unit { internal fun RepositoryHandler.applyRepos(): Unit { mavenCentral() maven("https://repo.kotlin.link") + maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers") } From 6d324b6e0de2612b967f7432de8e74c7e5397736 Mon Sep 17 00:00:00 2001 From: darksnake Date: Sat, 10 Apr 2021 15:11:39 +0300 Subject: [PATCH 2/6] Removed unnecessary `afterEvaluate` for compatibility with gradle 7.0 --- CHANGELOG.md | 1 + build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../ru/mipt/npm/gradle/internal/common.kt | 26 +++++++++---------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc31201..befa10e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed +- Removed unnecessary `afterEvaluate` for compatibility with gradle 7.0 ### Security diff --git a/build.gradle.kts b/build.gradle.kts index 47f10dc..59ded7b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.4" +version = "0.9.5-dev" description = "Build tools for DataForge and kscience projects" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..f371643 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.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt index 74ec198..775dc2f 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt @@ -26,28 +26,26 @@ internal fun RepositoryHandler.applyRepos(): Unit { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers") } -internal fun Copy.fromJsDependencies(configurationName: String) = project.afterEvaluate { +internal fun Copy.fromJsDependencies(configurationName: String) = project.run { val configuration = configurations[configurationName] ?: error("Configuration with name $configurationName could not be resolved.") val projectDeps = configuration.allDependencies.filterIsInstance().map { it.dependencyProject } projectDeps.forEach { dep -> - dep.afterEvaluate { - dep.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") { - dep.tasks.findByName("jsProcessResources")?.let { task -> - dependsOn(task) - from(task) - } - } - dep.pluginManager.withPlugin("org.jetbrains.kotlin.js") { - dep.tasks.findByName("processResources")?.let { task -> - dependsOn(task) - from(task) - } + dep.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") { + dep.tasks.findByName("jsProcessResources")?.let { task -> + dependsOn(task) + from(task) } } - } + dep.pluginManager.withPlugin("org.jetbrains.kotlin.js") { + dep.tasks.findByName("processResources")?.let { task -> + dependsOn(task) + from(task) + } + } + } } From 60f5d15ba1a93cd8c5d281e683dcfc6d0a505aa1 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 11 Apr 2021 09:44:42 +0300 Subject: [PATCH 3/6] Disable API validation for snapshots --- CHANGELOG.md | 1 + .../mipt/npm/gradle/KScienceProjectPlugin.kt | 26 ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index befa10e..12fa02e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +- Disable API validation for snapshots ### Changed - `publication.platform` changed to `publishing.platform` diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 5d666e4..87fa030 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -1,6 +1,7 @@ package ru.mipt.npm.gradle import groovy.text.SimpleTemplateEngine +import kotlinx.validation.ApiValidationExtension import kotlinx.validation.BinaryCompatibilityValidatorPlugin import org.gradle.api.Plugin import org.gradle.api.Project @@ -8,17 +9,14 @@ import org.gradle.kotlin.dsl.* import org.jetbrains.changelog.ChangelogPlugin import org.jetbrains.dokka.gradle.DokkaPlugin import org.jetbrains.dokka.gradle.DokkaTask -import ru.mipt.npm.gradle.internal.addGithubPublishing -import ru.mipt.npm.gradle.internal.addSonatypePublishing -import ru.mipt.npm.gradle.internal.addSpacePublishing -import ru.mipt.npm.gradle.internal.setupPublication +import ru.mipt.npm.gradle.internal.* @Suppress("unused") class KSciencePublishingExtension(val project: Project) { private var initializedFlag = false - fun configurePublications(vcsUrl: String){ - if(!initializedFlag) { + fun configurePublications(vcsUrl: String) { + if (!initializedFlag) { project.setupPublication(vcsUrl) initializedFlag = true } @@ -29,7 +27,7 @@ class KSciencePublishingExtension(val project: Project) { */ fun github(githubProject: String, githubOrg: String = "mipt-npm") { //automatically initialize vcs using github - if(!initializedFlag){ + if (!initializedFlag) { configurePublications("https://github.com/$githubOrg/$githubProject") } project.addGithubPublishing(githubOrg, githubProject) @@ -39,7 +37,7 @@ class KSciencePublishingExtension(val project: Project) { * Space publishing */ fun space(spaceRepo: String = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven") { - require(initializedFlag){"The publishing is not set up use 'configurePublications' method to do so"} + require(initializedFlag) { "The publishing is not set up use 'configurePublications' method to do so" } project.addSpacePublishing(spaceRepo) } @@ -52,8 +50,8 @@ class KSciencePublishingExtension(val project: Project) { /** * Sonatype publishing */ - fun sonatype(){ - require(initializedFlag){"The publishing is not set up use 'configurePublications' method to do so"} + fun sonatype() { + require(initializedFlag) { "The publishing is not set up use 'configurePublications' method to do so" } project.addSonatypePublishing() } } @@ -177,6 +175,14 @@ open class KScienceProjectPlugin : Plugin { description = "Publish development or production release based on version suffix" dependsOn(generateReadme) } + + // Disable API validation for snapshots + if (isSnapshot()) { + extensions.findByType()?.apply { + validationDisabled = true + logger.warn("API validation is disabled for snapshot or dev version") + } + } } companion object { From 9cd2eff18e2ec96efae3909fec55f0e1d53413a6 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 14 Apr 2021 18:18:53 +0300 Subject: [PATCH 4/6] Fix jvm-default bug --- CHANGELOG.md | 1 + build.gradle.kts | 6 ++---- .../ru/mipt/npm/gradle/KScienceCommonPlugin.kt | 2 ++ .../ru/mipt/npm/gradle/KScienceProjectPlugin.kt | 16 ++++++++-------- .../mipt/npm/gradle/KScienceReadmeExtension.kt | 2 +- .../ru/mipt/npm/gradle/KScienceVersions.kt | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12fa02e..8638d24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added - Disable API validation for snapshots +- `-Xjvm-default=all` on JVM ### Changed - `publication.platform` changed to `publishing.platform` diff --git a/build.gradle.kts b/build.gradle.kts index 59ded7b..f09f6c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,14 +13,12 @@ version = "0.9.5-dev" description = "Build tools for DataForge and kscience projects" repositories { + mavenCentral() gradlePluginPortal() - jcenter() maven("https://repo.kotlin.link") - maven("https://kotlin.bintray.com/kotlinx") - maven("https://dl.bintray.com/kotlin/kotlin-dev") } -val kotlinVersion = "1.5.0-M2" +val kotlinVersion = "1.5.0-RC" java { targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt index d3b1b65..33a9556 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt @@ -42,6 +42,7 @@ open class KScienceCommonPlugin : Plugin { kotlinOptions { useIR = true jvmTarget = KScienceVersions.JVM_TARGET.toString() + freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" } } @@ -96,6 +97,7 @@ open class KScienceCommonPlugin : Plugin { kotlinOptions { useIR = true jvmTarget = KScienceVersions.JVM_TARGET.toString() + freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" } } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 87fa030..8d33965 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -137,19 +137,19 @@ open class KScienceProjectPlugin : Plugin { val name = subproject.name val path = subproject.path.replaceFirst(":", "").replace(":", "/") val ext = subproject.extensions.findByType() - appendln("
") - appendln("\n* ### [$name]($path)") + appendLine("
") + appendLine("\n* ### [$name]($path)") if (ext != null) { - appendln("> ${ext.description}") - appendln(">\n> **Maturity**: ${ext.maturity}") + appendLine("> ${ext.description}") + appendLine(">\n> **Maturity**: ${ext.maturity}") val featureString = ext.featuresString(itemPrefix = "> - ", pathPrefix = "$path/") if (featureString.isNotBlank()) { - appendln(">\n> **Features:**") - appendln(featureString) + appendLine(">\n> **Features:**") + appendLine(featureString) } } } - appendln("
") + appendLine("
") } val rootReadmeProperties: Map = @@ -168,7 +168,7 @@ open class KScienceProjectPlugin : Plugin { dependsOn(generateReadme) } - val patchChangelog by tasks.getting + //val patchChangelog by tasks.getting val release by tasks.creating { group = RELEASE_GROUP diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt index 25b362c..0b79d45 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt @@ -80,7 +80,7 @@ class KScienceReadmeExtension(val project: Project) { */ fun featuresString(itemPrefix: String = " - ", pathPrefix: String = "") = buildString { features.forEach { - appendln("$itemPrefix[${it.name}]($pathPrefix${it.ref ?: "#"}) : ${it.description}") + appendLine("$itemPrefix[${it.name}]($pathPrefix${it.ref ?: "#"}) : ${it.description}") } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index 9fa3180..f868033 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -6,7 +6,7 @@ import org.gradle.api.JavaVersion * Build constants */ object KScienceVersions { - const val kotlinVersion = "1.5.0-M2" + const val kotlinVersion = "1.5.0-RC" const val kotlinxNodeVersion = "0.0.7" const val coroutinesVersion = "1.4.3" const val serializationVersion = "1.1.0" From 3c3de0f2bf69d31fdc64cf6d9e6f2bf763c07eed Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 14 Apr 2021 18:25:37 +0300 Subject: [PATCH 5/6] Fix jvm-default bug --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f09f6c3..634e83f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.5-dev" +version = "0.9.5-dev-2" description = "Build tools for DataForge and kscience projects" From 239a5c09f1512fd26e3bc539a4b2197e1aad0d1f Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 26 Apr 2021 19:17:11 +0300 Subject: [PATCH 6/6] 0.9.5 --- CHANGELOG.md | 14 ++++++++++++++ build.gradle.kts | 14 +++++++++----- .../ru/mipt/npm/gradle/KScienceExtension.kt | 13 ++++++++++++- .../mipt/npm/gradle/KSciencePublishingPlugin.kt | 17 ----------------- .../mipt/npm/gradle/KScienceReadmeExtension.kt | 1 + .../ru/mipt/npm/gradle/KScienceVersions.kt | 6 +++--- 6 files changed, 39 insertions(+), 26 deletions(-) delete mode 100644 src/main/kotlin/ru/mipt/npm/gradle/KSciencePublishingPlugin.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 8638d24..a68ea7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## [0.9.5] +### Added - Disable API validation for snapshots - `-Xjvm-default=all` on JVM @@ -19,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated ### Removed +- Publish plugin. Use MavenPublish instead ### Fixed - Removed unnecessary `afterEvaluate` for compatibility with gradle 7.0 diff --git a/build.gradle.kts b/build.gradle.kts index 634e83f..2d3f61f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,21 +4,25 @@ plugins { `maven-publish` signing id("org.jetbrains.changelog") version "1.1.2" - id("org.jetbrains.dokka") version "1.4.30" + id("org.jetbrains.dokka") version "1.4.32" } group = "ru.mipt.npm" -version = "0.9.5-dev-2" +version = "0.9.5" description = "Build tools for DataForge and kscience projects" +changelog{ + version = project.version.toString() +} + repositories { mavenCentral() gradlePluginPortal() maven("https://repo.kotlin.link") } -val kotlinVersion = "1.5.0-RC" +val kotlinVersion = "1.5.0" java { targetCompatibility = JavaVersion.VERSION_1_8 @@ -28,8 +32,8 @@ 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.2") - implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.30") + implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.16.1") + implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.32") implementation("org.jetbrains.intellij.plugins:gradle-changelog-plugin:1.1.2") implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0") } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt index 7a9c85f..110f22d 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt @@ -2,6 +2,7 @@ package ru.mipt.npm.gradle import org.gradle.api.Project import org.gradle.api.plugins.ApplicationPlugin +import org.gradle.api.publish.maven.plugins.MavenPublishPlugin import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.findByType import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension @@ -101,6 +102,16 @@ class KScienceExtension(val project: Project) { platform: FXPlatform = defaultPlatform ) = project.useFx(modules.toList(), configuration, version, platform) + fun useHtml( + version: String = KScienceVersions.atomicVersion, + sourceSet: DependencySourceSet = DependencySourceSet.MAIN, + configuration: DependencyConfiguration = DependencyConfiguration.IMPLEMENTATION + ): Unit = project.useCommonDependency( + "org.jetbrains.kotlinx:kotlinx-html:$version", + dependencySourceSet = sourceSet, + dependencyConfiguration = configuration + ) + /** * Use kotlinx-datetime library with default version or [version] */ @@ -137,7 +148,7 @@ class KScienceExtension(val project: Project) { } fun publish() { - project.plugins.apply(KSciencePublishingPlugin::class) + project.plugins.apply(MavenPublishPlugin::class) } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KSciencePublishingPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KSciencePublishingPlugin.kt deleted file mode 100644 index 7946020..0000000 --- a/src/main/kotlin/ru/mipt/npm/gradle/KSciencePublishingPlugin.kt +++ /dev/null @@ -1,17 +0,0 @@ -package ru.mipt.npm.gradle - -import org.gradle.api.Plugin -import org.gradle.api.Project - -@Deprecated("To be replaced by maven-publish") -open class KSciencePublishingPlugin : Plugin { - - override fun apply(project: Project): Unit = project.run { - if (plugins.findPlugin("maven-publish") == null) { - plugins.apply("maven-publish") - } - } - -} - - diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt index 0b79d45..53e6e71 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt @@ -38,6 +38,7 @@ class KScienceReadmeExtension(val project: Project) { val features = ArrayList() + @Deprecated("Use lambda builder instead") fun feature(id: String, description: String, ref: String? = null, name: String = id) { features.add(Feature(id, description, ref, name)) } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index f868033..eb8f07e 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -6,11 +6,11 @@ import org.gradle.api.JavaVersion * Build constants */ object KScienceVersions { - const val kotlinVersion = "1.5.0-RC" + const val kotlinVersion = "1.5.0" const val kotlinxNodeVersion = "0.0.7" const val coroutinesVersion = "1.4.3" const val serializationVersion = "1.1.0" - const val atomicVersion = "0.15.1" + const val atomicVersion = "0.16.1" const val ktorVersion = "1.5.3" const val htmlVersion = "0.7.3" const val dateTimeVersion = "0.1.1" @@ -18,7 +18,7 @@ object KScienceVersions { val JVM_TARGET = JavaVersion.VERSION_11 object Serialization{ - const val xmlVersion = "0.81.1" + const val xmlVersion = "0.81.2" const val bsonVersion = "0.4.4" const val yamlKtVersion = "0.9.0" }