Merge pull request #41 from mipt-npm/dev

Dev

Author: altavir

CHANGELOG.md

@@ -7,47 +7,60 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- html builders for readme
 
 ### Changed
-- Kotlin 1.6.0
-- Use indy lambdas by default #32 
+- Separate release tasks for each target
 
 ### Deprecated
 
 ### Removed
 
 ### Fixed
-- remove `nativeMain` dependency from `nativeTest`
 
 ### Security
 
-## [0.10.4]
+## [0.11.1-kotlin-1.6.10]
 ### Added
+- Default templates for README and ARTIFACT
 
 ### Changed
-- Kotlin 1.6
-
+- Replaced Groovy templates by FreeMarker
 
 ### Deprecated
 
 ### Removed
 
 ### Fixed
-- Some issues with opt-ins
-
+- JS publication sources jar
 
 ### Security
 
+## [0.10.9-kotlin-1.6.10]
+### Added
+- html builders for readme
+
+### Changed
+- Kotlin 1.6.0
+- Use indy lambdas by default #32 
+- Change version scheme to `<version>-kotlin-<kotlin version>`
+
+### Fixed
+- remove `nativeMain` dependency from `nativeTest`
+
+## [0.10.4]
+### Changed
+- Kotlin 1.6
+
+### Fixed
+- Some issues with opt-ins
+
 ## [0.10.2]
 ### Added
 - Experimental automatic JS project bundling in MPP
 
-
 ### Changed
 - Remove vcs requirement for Space publication
 
-
 ### Fixed
 -Release task (#19)
 
@@ -57,12 +70,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - BOM for kotlin-wrappers on JS
 - Jupyter loader
 
-
 ### Changed
 - API validation disabled for dev versions
 - Kotlin plugins are propagated downstream
 
-
 ### Removed
 - bson support
 
@@ -71,35 +82,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Disable API validation for snapshots
 - `-Xjvm-default=all` on JVM
 
-
 ### Changed
 - `publication.platform` changed to `publishing.platform`
 - Dokka version to `1.4.30`
 - `useDateTime` in extension
 - Kotlin 1.5
 
-
 ### Removed
 - Publish plugin. Use MavenPublish instead
 
-
 ### Fixed
 - Removed unnecessary `afterEvaluate` for compatibility with gradle 7.0
 
 ## [0.9.0]
 ### Added
 - Skip sonatype publishing for dev versions
 
-
 ### Changed
 - Publishing repositories are explicit and defined in the top level project
 - Paths to publishing properties now use dot notation like `publishing.github.user`
 
-
 ### Deprecated
 - Publishing plugin
 
-
 ### Removed
 - Bintray publishing
 
@@ -108,12 +113,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Adaptive support for host OS in native
 - CSS support for JS targets
 
-
 ### Changed
 - Kotlin 1.4.31
 - Coroutines 1.4.3
 
-
 ### Fixed
 - Plugin loading order for publishing
 - Release task
@@ -125,19 +128,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add sonatype publishing
 - Per-platform release publishing
 
-
 ### Changed
 - Kotlin to 1.4.30 stable.
 - Added intermediate jsCommon main/test sourcesSet for node plugin.
 - Plugin names changed to `ru.mipt.npm` package.
 - Common plugin id changed to `common`
 - Plugins group changed to `ru.mipt.npm` with `gradle` prefix
 
-
 ### Removed
 - kaml
 
-
 ### Fixed
 - Fix publishing load order for sonatype
 - Fix root project readme
@@ -151,7 +151,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Moved all logic to a common plugin, leaving only proxies for platform plugins
 - Suppress API validation for modules with maturity below DEVELOPMENT
 
-
 ### Changed
 - Remove node plugin. Node binaries should be turned on manually.
 - Use default webpack distribution path.
@@ -162,12 +161,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Moved internals to internals
 - Kotlin 1.4.30-RC
 
-
 ### Deprecated
 - Support of `kaml` and `snake-yaml` in favor of `yamlKt`
 - Publish plugin
 
-
 ### Removed
 - `useDokka` method. Documentation jar should be added manually if needed.
 
@@ -178,7 +175,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `application()` toggle in plugin configuration to produce binaries on JS and applicaion plugin on jvm.
 - Add `publish` to expose publishing configuration.
 
-
 ### Changed
 -Publishing in bintray now is automatic.
 

build.gradle.kts

@@ -33,12 +33,13 @@ dependencies {
     implementation(libs.dokka.gradle)
     implementation(libs.kotlin.jupyter.gradle)
     implementation(libs.kotlin.serialization)
-    @Suppress("UnstableApiUsage")
     implementation(libs.kotlinx.html)
     implementation("org.tomlj:tomlj:1.0.0")
 //    // nexus publishing plugin
 //    implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
 
+    implementation("org.freemarker:freemarker:2.3.31")
+
     testImplementation(kotlin("test"))
 }
 
@@ -58,7 +59,7 @@ gradlePlugin {
 
         create("project") {
             id = "ru.mipt.npm.gradle.project"
-            description = "The root plugin for multimodule project infrastructure"
+            description = "The root plugin for multi-module project infrastructure"
             implementationClass = "ru.mipt.npm.gradle.KScienceProjectPlugin"
         }
 
@@ -122,7 +123,7 @@ afterEvaluate {
         publications {
             create<MavenPublication>("catalog") {
                 from(components["versionCatalog"])
-                this.artifactId = "version-catalog"
+                artifactId = "version-catalog"
 
                 pom {
                     name.set("version-catalog")
@@ -134,6 +135,7 @@ afterEvaluate {
                 artifact(javadocsJar)
 
                 pom {
+                    name.set(project.name)
                     description.set(project.description)
                     url.set(vcs)
 
@@ -212,6 +214,10 @@ afterEvaluate {
     }
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.jvmTarget = "11"
+}
+
 tasks.processResources.configure {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
     from("gradle/libs.versions.toml")

gradle/libs.versions.toml

@@ -1,25 +1,25 @@
 [versions]
-tools = "0.10.7"
-kotlin = "1.6.0"
-atomicfu = "0.16.3"
+tools = "0.11.2-kotlin-1.6.10"
+kotlin = "1.6.10"
+atomicfu = "0.17.1"
 binary-compatibility-validator = "0.8.0"
 changelog = "1.3.1"
-dokka = "1.5.30"
-kotlin-jupyter = "0.10.3-36"
-kotlinx-benchmark = "0.3.1"
-kotlinx-cli = "0.3.3"
-kotlinx-collections-immutable = "0.3.4"
-kotlinx-coroutines = "1.5.2"
-kotlinx-datetime = "0.3.1"
+dokka = "1.6.10"
+kotlin-jupyter = "0.11.0-62"
+kotlinx-benchmark = "0.4.2"
+kotlinx-cli = "0.3.4"
+kotlinx-collections-immutable = "0.3.5"
+kotlinx-coroutines = "1.6.0"
+kotlinx-datetime = "0.3.2"
 kotlinx-html = "0.7.3"
-kotlinx-knit = "0.2.3"
+kotlinx-knit = "0.3.0"
 kotlinx-nodejs = "0.0.7"
-kotlinx-serialization = "1.3.1"
-ktor = "1.6.3"
-xmlutil = "0.83.0"
+kotlinx-serialization = "1.3.2"
+ktor = "1.6.7"
+xmlutil = "0.84.0"
 yamlkt = "0.10.2"
-jsBom = "0.0.1-pre.265-kotlin-1.5.31"
-junit = "5.8.1"
+jsBom = "0.0.1-pre.313-kotlin-1.6.10"
+junit = "5.8.2"
 
 [libraries]
 atomicfu-gradle = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,3 +1 @@
 rootProject.name = "gradle-tools"
-
-enableFeaturePreview("VERSION_CATALOGS")