0.9.5

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

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")
 }

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)
     }
 }
 

src/main/kotlin/ru/mipt/npm/gradle/KSciencePublishingPlugin.kt

@@ -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<Project> {
-
-    override fun apply(project: Project): Unit = project.run {
-        if (plugins.findPlugin("maven-publish") == null) {
-            plugins.apply("maven-publish")
-        }
-    }
-
-}
-
-

src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt

@@ -38,6 +38,7 @@ class KScienceReadmeExtension(val project: Project) {
 
     val features = ArrayList<Feature>()
 
+    @Deprecated("Use lambda builder instead")
     fun feature(id: String, description: String, ref: String? = null, name: String = id) {
         features.add(Feature(id, description, ref, name))
     }

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"
     }