From a221951197ec1fd6a46d1627c67c6a78823acf90 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 8 May 2021 13:57:46 +0300
Subject: [PATCH] 0.9.6

---
 build.gradle.kts                                          | 2 +-
 src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt   | 2 +-
 .../kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt    | 8 ++++++++
 src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt    | 8 ++++----
 .../kotlin/ru/mipt/npm/gradle/SerializationTargets.kt     | 7 +------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2d3f61f..95dc701 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "ru.mipt.npm"
-version = "0.9.5"
+version = "0.9.6"
 
 description = "Build tools for DataForge and kscience projects"
 
diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt
index 110f22d..0863f7a 100644
--- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt
+++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt
@@ -103,7 +103,7 @@ class KScienceExtension(val project: Project) {
     ) = project.useFx(modules.toList(), configuration, version, platform)
 
     fun useHtml(
-        version: String = KScienceVersions.atomicVersion,
+        version: String = KScienceVersions.htmlVersion,
         sourceSet: DependencySourceSet = DependencySourceSet.MAIN,
         configuration: DependencyConfiguration = DependencyConfiguration.IMPLEMENTATION
     ): Unit = project.useCommonDependency(
diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt
index 8d33965..14f38a3 100644
--- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt
+++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt
@@ -7,6 +7,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.*
 import org.jetbrains.changelog.ChangelogPlugin
+import org.jetbrains.changelog.ChangelogPluginExtension
 import org.jetbrains.dokka.gradle.DokkaPlugin
 import org.jetbrains.dokka.gradle.DokkaTask
 import ru.mipt.npm.gradle.internal.*
@@ -63,6 +64,13 @@ class KSciencePublishingExtension(val project: Project) {
 open class KScienceProjectPlugin : Plugin<Project> {
     override fun apply(target: Project): Unit = target.run {
         apply<ChangelogPlugin>()
+
+        if(!isSnapshot()) {
+            configure<ChangelogPluginExtension> {
+                version = project.version.toString()
+            }
+        }
+
         apply<DokkaPlugin>()
         apply<BinaryCompatibilityValidatorPlugin>()
 
diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt
index eb8f07e..baf60eb 100644
--- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt
+++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt
@@ -8,17 +8,17 @@ import org.gradle.api.JavaVersion
 object KScienceVersions {
     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 coroutinesVersion = "1.5.0-RC"
+    const val serializationVersion = "1.2.0"
     const val atomicVersion = "0.16.1"
     const val ktorVersion = "1.5.3"
     const val htmlVersion = "0.7.3"
-    const val dateTimeVersion = "0.1.1"
+    const val dateTimeVersion = "0.2.0"
 
     val JVM_TARGET = JavaVersion.VERSION_11
 
     object Serialization{
-        const val xmlVersion = "0.81.2"
+        const val xmlVersion = "0.82.0"
         const val bsonVersion = "0.4.4"
         const val yamlKtVersion = "0.9.0"
     }
diff --git a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt
index f9972d3..531a608 100644
--- a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt
+++ b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt
@@ -1,8 +1,6 @@
 package ru.mipt.npm.gradle
 
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.maven
-import org.gradle.kotlin.dsl.repositories
 import ru.mipt.npm.gradle.internal.useCommonDependency
 import ru.mipt.npm.gradle.internal.useDependency
 
@@ -44,11 +42,8 @@ class SerializationTargets(
     fun Project.xml(
         version: String = KScienceVersions.Serialization.xmlVersion
     ) {
-        repositories {
-            maven("https://dl.bintray.com/pdvrieze/maven")
-        }
         useCommonDependency(
-            "net.devrieze:xmlutil-serialization:$version",
+            "io.github.pdvrieze.xmlutil:serialization:$version",
             dependencySourceSet = sourceSet,
             dependencyConfiguration = configuration
         )