Merge pull request '0.15.8-kotlin-2.1.0' (!51) from dev into master

Reviewed-on: #51

.github/workflows/build.yml

@@ -0,0 +1,21 @@
+name: Gradle build
+
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 40
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2.5.0
+        with:
+          java-version: 11
+          distribution: liberica
+      - uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build

.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+name: Gradle publish
+
+on:
+  workflow_dispatch:
+  release:
+    types: [ created ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 40
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2.5.0
+        with:
+          java-version: 11
+          distribution: liberica
+      - uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            publishAllPublicationsToSpaceRepository
+            -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+            -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}

.space.kts

@@ -0,0 +1,43 @@
+import kotlin.io.path.readText
+
+job("Build") {
+    gradlew("openjdk:11", "build")
+}
+
+job("Publish"){
+    startOn {
+        gitPush { enabled = false }
+    }
+    container("openjdk:11") {
+        env["SPACE_USER"] = Secrets("space_user")
+        env["SPACE_TOKEN"] = Secrets("space_token")
+        kotlinScript { api ->
+
+            val spaceUser = System.getenv("SPACE_USER")
+            val spaceToken = System.getenv("SPACE_TOKEN")
+
+            // write version to the build directory
+            api.gradlew("version")
+
+            //read version from build file
+            val version = java.nio.file.Path.of("build/project-version.txt").readText()
+
+            api.space().projects.automation.deployments.start(
+                project = api.projectIdentifier(),
+                targetIdentifier = TargetIdentifier.Key("gradle-tools"),
+                version = version,
+                // automatically update deployment status based on a status of a job
+                syncWithAutomationJob = true
+            )
+            try {
+                api.gradlew(
+                    "publishAllPublicationsToSpaceRepository",
+                    "-Ppublishing.space.user=\"$spaceUser\"",
+                    "-Ppublishing.space.token=\"$spaceToken\"",
+                )
+            } catch (ex: Exception) {
+                println("Publish failed")
+            }
+        }
+    }
+}

CHANGELOG.md

@@ -1,11 +1,11 @@
 # Changelog
 
 All notable changes to this project will be documented in this file.
-
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## Unreleased
+
 ### Added
 
 ### Changed
@@ -18,92 +18,277 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
-## [0.9.5]
+## 0.15.4-kotlin-2.0.0 - 2024-06-04
+
 ### Added
+
+- Pass `compose` extension to the kscience extension so compose dependencies could be called directly from kscience block
+
+### Changed
+
+- Use ES6 modules by default in JS
+- Kotlin 2.0
+
+## 0.15.2-kotlin-1.9.22 - 2024-02-09
+
+### Added
+
+- Add development mode for fullstack.
+
+### Changed
+
+- Kotlin 1.9.20
+- Remove publishing defaults for Space and GitHub. Now publishing repositories is configured quasi-manually. Property keys for username and tokens are generated automatically.
+- All publishing targets are enabled by default. Introduce `publishing.targets` variable to regulate what is added to the module.
+
+### Deprecated
+
+- JVM plugin in favor of Mpp.
+
+### Removed
+
+- JS plugin. It is deprecated in favor of MPP.
+- Unnecessary `dependsOn` for native dependencies. 
+- Groovy gradle dependency notation.
+
+## 0.14.4-kotlin-1.8.20-RC - 2023-03-12
+
+### Added
+
+- Easier dependency handling in `kscience` block
+- Customizable base jdk version
+
+### Changed
+
+- MPP does not use JVM and JS(IR) targets anymore. They could be turned manually via `js()`, `jvm()` or `fullStack()`
+- Signing is not applied if signingId is not provided
+
+### Removed
+
+- FX plugins
+- Unnecessary library shortcuts (html and datetime)
+- deploy/release tasks
+
+### Fixed
+
+- Gradle 8 compatibility
+- Dokka publication
+- issues with test sourcesets
+
+## 0.13.4-kotlin-1.8.0 - 2022-12-31
+
+### Added
+
+- Public `isInDevelopment` project flag
+
+### Changed
+
+- Require manual pom config for publications
+- Kotlin 1.8.0
+- Versions update
+- Project group changed to `space.kscience`
+- Moved `yarn.lock` to `gradle` directory
+
+### Deprecated
+
+- FX configuration
+
+### Removed
+
+- Xjdk-release flag because it is broken until https://youtrack.jetbrains.com/issue/KT-52823
+- Use CSS loader in JS by default
+
+## 0.11.6-kotlin-1.7.0
+
+### Changed
+
+- Coroutines tests are applied only when explicit `useCoroutines` is used.
+
+### Removed
+
+- Atomicfu support inside the plugin
+
+### Fixed
+
+- Rollback coroutines to 1.6.1
+
+## 0.11.5-kotlin-1.7.0
+
+### Added
+
+- Coroutine tests as default dependency for tests
+- Context receiver flag
+
+### Changed
+
+- Separate release tasks for each target
+- Kotlin 1.7.0
+- Ktor 2.0.1
+- ExplicitAPI does not override existing value
+
+### Removed
+
+- Ktor specific artifacts from version catalog
+
+### Fixed
+
+- Moved signing out of sonatype block
+
+## 0.11.1-kotlin-1.6.10
+
+### Added
+
+- Default templates for README and ARTIFACT
+
+### Changed
+
+- Replaced Groovy templates by FreeMarker
+
+### Fixed
+
+- JS publication sources jar
+
+## 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
+
+## 0.10.0
+
+### Added
+
+- Lazy readme properties
+- BOM for kotlin-wrappers on JS
+- Jupyter loader
+
+### Changed
+
+- API validation disabled for dev versions
+- Kotlin plugins are propagated downstream
+
+### Removed
+
+- bson support
+
+## 0.9.5
+
+### Added
+
 - 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
 
-### Deprecated
-
 ### Removed
+
 - Publish plugin. Use MavenPublish instead
 
 ### Fixed
+
 - Removed unnecessary `afterEvaluate` for compatibility with gradle 7.0
 
-### Security
+## 0.9.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
 
-### Fixed
+## 0.8.4
 
-### Security
-
-## [0.8.4]
 ### Added
+
 - Adaptive support for host OS in native
 - CSS support for JS targets
 
 ### Changed
+
 - Kotlin 1.4.31
 - Coroutines 1.4.3
 
-### Deprecated
-
-### Removed
-
 ### Fixed
+
 - Plugin loading order for publishing
 - Release task
 - Readme generation for multi-module project
 
-### Security
+## 0.8.1
 
-## [0.8.1]
 ### Added
+
 - Ktor version to versions
 - 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
 
-### Deprecated
-
 ### Removed
+
 - kaml
 
 ### Fixed
+
 - Fix publishing load order for sonatype
 - Fix root project readme
 
-### Security
-
-## [0.7.4]
+## 0.7.4
 
 ### Added
+
 - Changelog plugin automatically applied to `project`.
 - Feature matrix and Readme generation task for a `project` plugin.
 - Add `binary-compatibility-validator` to the `project` plugin.
@@ -112,6 +297,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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.
 - `ru.mipt.npm.base` -> `ru.mipt.npm.project`.
@@ -122,28 +308,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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.
 
-
-### Fixed
-
-### Security
-## [0.6.0]
+## 0.6.0
 
 ### Added
+
 - Migrate to kotlin 1.4.0
 - Separate Native (current platform) and nodeJs plugins.
 - 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.
-
-## [0.5.2]
+## 0.5.2
 
 ### Added
-- Copy resources for jvm modules and jvm source sets in mpp.
+
+- Copy resources for jvm modules and jvm source sets in mpp.

README.md

@@ -1,29 +1,28 @@
+[![Maven Central](https://img.shields.io/maven-central/v/space.kscience.gradle.project/space.kscience.gradle.project.gradle.plugin.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22space.kscience.gradle.project%22%20AND%20a:%22space.kscience.gradle.project.gradle.plugin%22)
+
 # KScience build tools
 
 A collection of gradle plugins for building and publish in *kscience* and *dataforge* projects.
 
-## ru.mipt.npm.gradle.common
+## space.kscience.gradle.common
 A primary plugin. When used with kotlin-jvm, kotlin-js or kotlin-mulitplatform configures the project for appropriate target.
 
-## ru.mipt.npm.gradle.project
+## space.kscience.gradle.project
 Root project tool including JetBrains changelog plugin an kotlin binary compatibility validator tool.
 
-## ru.mipt.npm.gradle.publish
-Enables publishing to maven-central, bintray, Space and github.
-
-## ru.mipt.npm.gradle.mpp
-`= kotlin("multiplatform") + ru.mipt.npm.gradle.common`
+## space.kscience.gradle.mpp
+`= kotlin("multiplatform") + space.kscience.gradle.common`
 
 Includes JVM-IR and JS-IR-Browser targets.
 
-## ru.mipt.npm.gradle.jvm
-`= kotlin("jvm") + ru.mipt.npm.gradle.common`
+## space.kscience.gradle.jvm
+`= kotlin("jvm") + space.kscience.gradle.common`
 
-## ru.mipt.npm.gradle.js
-`= kotlin("js") + ru.mipt.npm.gradle.common`
+## space.kscience.gradle.js
+`= kotlin("js") + space.kscience.gradle.common`
 
-## ru.mipt.npm.gradle.native
-add default native targets to `ru.mipt.npm.gradle.mpp`
+## space.kscience.gradle.native
+add default native targets to `space.kscience.gradle.mpp`
 
-## ru.mipt.npm.gradle.node
-add node target to `ru.mipt.npm.gradle.mpp`
+## space.kscience.gradle.node
+add node target to `space.kscience.gradle.mpp`

build.gradle.kts

@@ -1,20 +1,23 @@
+
 plugins {
     `java-gradle-plugin`
     `kotlin-dsl`
     `maven-publish`
-    signing
-    id("org.jetbrains.changelog") version "1.1.2"
-    id("org.jetbrains.dokka") version "1.4.32"
+//    signing
+    `version-catalog`
+    alias(libs.plugins.maven.publish)
+    alias(libs.plugins.jetbrains.changelog)
+    alias(libs.plugins.jetbrains.dokka)
+    alias(libs.plugins.versions)
+    alias(libs.plugins.versions.update)
 }
 
-group = "ru.mipt.npm"
-version = "0.9.5"
+group = "space.kscience"
+version = libs.versions.tools.get()
 
-description = "Build tools for DataForge and kscience projects"
+description = "Build tools for kotlin for science projects"
 
-changelog{
-    version = project.version.toString()
-}
+changelog.version.set(project.version.toString())
 
 repositories {
     mavenCentral()
@@ -22,167 +25,182 @@ repositories {
     maven("https://repo.kotlin.link")
 }
 
-val kotlinVersion = "1.5.0"
-
-java {
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-// Add plugins used in buildSrc as dependencies, also we should specify version only here
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
-    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")
+    api(libs.kotlin.gradle)
+    api(libs.foojay.resolver)
+    implementation(libs.binary.compatibility.validator)
+    implementation(libs.changelog.gradle)
+    implementation(libs.dokka.gradle)
+    implementation(libs.kotlin.jupyter.gradle)
+    implementation(libs.kotlin.serialization)
+    implementation(libs.kotlinx.html)
+    implementation(libs.tomlj)
+//    // nexus publishing plugin
+//    implementation("io.github.gradle-nexus:publish-plugin:_")
+
+    implementation(libs.freemarker)
+
+    testImplementation(kotlin("test"))
 }
 
-project.extensions.findByType<GradlePluginDevelopmentExtension>()?.apply {
-    plugins {
-        create("common") {
-            id = "ru.mipt.npm.gradle.common"
-            description = "The generalized kscience plugin that works in conjunction with any kotlin plugin"
-            implementationClass = "ru.mipt.npm.gradle.KScienceCommonPlugin"
-        }
+tasks.test {
+    useJUnitPlatform()
+}
 
+//declaring exported plugins
+
+gradlePlugin {
+    plugins {
         create("project") {
-            id = "ru.mipt.npm.gradle.project"
-            description = "The root plugin for multimodule project infrastructure"
-            implementationClass = "ru.mipt.npm.gradle.KScienceProjectPlugin"
+            id = "space.kscience.gradle.project"
+            description = "The root plugin for multi-module project infrastructure"
+            implementationClass = "space.kscience.gradle.KScienceProjectPlugin"
         }
 
         create("mpp") {
-            id = "ru.mipt.npm.gradle.mpp"
+            id = "space.kscience.gradle.mpp"
             description = "Pre-configured multiplatform project"
-            implementationClass = "ru.mipt.npm.gradle.KScienceMPPlugin"
+            implementationClass = "space.kscience.gradle.KScienceMPPlugin"
         }
 
         create("jvm") {
-            id = "ru.mipt.npm.gradle.jvm"
+            id = "space.kscience.gradle.jvm"
             description = "Pre-configured JVM project"
-            implementationClass = "ru.mipt.npm.gradle.KScienceJVMPlugin"
-        }
-
-        create("js") {
-            id = "ru.mipt.npm.gradle.js"
-            description = "Pre-configured JS project"
-            implementationClass = "ru.mipt.npm.gradle.KScienceJSPlugin"
-        }
-
-        create("native") {
-            id = "ru.mipt.npm.gradle.native"
-            description = "Additional native targets to be use alongside mpp"
-            implementationClass = "ru.mipt.npm.gradle.KScienceNativePlugin"