Migrate to new package and Kotlin 1.7.20-Beta

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Kotlin 1.7.10
 - Versions update
+- Project group changed to `space.kscience`
 
 ### Deprecated
 

README.md

@@ -1,28 +1,28 @@
-[![Maven Central](https://img.shields.io/maven-central/v/ru.mipt.npm.gradle.project/ru.mipt.npm.gradle.project.gradle.plugin.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22ru.mipt.npm.gradle.project%22%20AND%20a:%22ru.mipt.npm.gradle.project.gradle.plugin%22)
+[![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.mpp
+## space.kscience.gradle.mpp
-`= kotlin("multiplatform") + ru.mipt.npm.gradle.common`
+`= kotlin("multiplatform") + space.kscience.gradle.common`
 
 Includes JVM-IR and JS-IR-Browser targets.
 
-## ru.mipt.npm.gradle.jvm
+## space.kscience.gradle.jvm
-`= kotlin("jvm") + ru.mipt.npm.gradle.common`
+`= kotlin("jvm") + space.kscience.gradle.common`
 
-## ru.mipt.npm.gradle.js
+## space.kscience.gradle.js
-`= kotlin("js") + ru.mipt.npm.gradle.common`
+`= kotlin("js") + space.kscience.gradle.common`
 
-## ru.mipt.npm.gradle.native
+## space.kscience.gradle.native
-add default native targets to `ru.mipt.npm.gradle.mpp`
+add default native targets to `space.kscience.gradle.mpp`
 
-## ru.mipt.npm.gradle.node
+## space.kscience.gradle.node
-add node target to `ru.mipt.npm.gradle.mpp`
+add node target to `space.kscience.gradle.mpp`

build.gradle.kts

@@ -9,10 +9,10 @@ plugins {
     `version-catalog`
 }
 
-group = "ru.mipt.npm"
+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.set(project.version.toString())
 
@@ -52,50 +52,51 @@ tasks.test {
 gradlePlugin {
     plugins {
         create("common") {
-            id = "ru.mipt.npm.gradle.common"
+            id = "space.kscience.gradle.common"
             description = "The generalized kscience plugin that works in conjunction with any kotlin plugin"
-            implementationClass = "ru.mipt.npm.gradle.KScienceCommonPlugin"
+            implementationClass = "space.kscience.gradle.KScienceCommonPlugin"
         }
 
         create("project") {
-            id = "ru.mipt.npm.gradle.project"
+            id = "space.kscience.gradle.project"
             description = "The root plugin for multi-module project infrastructure"
-            implementationClass = "ru.mipt.npm.gradle.KScienceProjectPlugin"
+            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"
+            implementationClass = "space.kscience.gradle.KScienceJVMPlugin"
         }
 
         create("js") {
-            id = "ru.mipt.npm.gradle.js"
+            id = "space.kscience.gradle.js"
             description = "Pre-configured JS project"
-            implementationClass = "ru.mipt.npm.gradle.KScienceJSPlugin"
+            implementationClass = "space.kscience.gradle.KScienceJSPlugin"
         }
 
         create("native") {
-            id = "ru.mipt.npm.gradle.native"
+            id = "space.kscience.gradle.native"
             description = "Additional native targets to be use alongside mpp"
-            implementationClass = "ru.mipt.npm.gradle.KScienceNativePlugin"
+            implementationClass = "space.kscience.gradle.KScienceNativePlugin"
         }
 
         create("node") {
-            id = "ru.mipt.npm.gradle.node"
+            id = "space.kscience.gradle.node"
             description = "Additional nodejs target to be use alongside mpp"
-            implementationClass = "ru.mipt.npm.gradle.KScienceNodePlugin"
+            implementationClass = "space.kscience.gradle.KScienceNodePlugin"
         }
     }
 }
 
 tasks.create("version") {
+    group = "publishing"
     val versionFile = project.buildDir.resolve("project-version.txt")
     outputs.file(versionFile)
     doLast {
@@ -174,7 +175,7 @@ afterEvaluate {
             }
         }
 
-        val spaceRepo = "https://maven.pkg.jetbrains.space/mipt-npm/p/mipt-npm/maven"
+        val spaceRepo = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven"
         val spaceUser: String? = project.findProperty("publishing.space.user") as? String
         val spaceToken: String? = project.findProperty("publishing.space.token") as? String
 

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-tools = "0.11.8-kotlin-1.7.10"
+tools = "0.12.0-kotlin-1.7.20-Beta"
-kotlin = "1.7.10"
+kotlin = "1.7.20-Beta"
 atomicfu = "0.18.2"
 binary-compatibility-validator = "0.10.1"
 changelog = "1.3.1"
@@ -82,13 +82,13 @@ changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
 
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 
-gradle-common = { id = "ru.mipt.npm.gradle.common", version.ref = "tools" }
+gradle-common = { id = "space.kscience.gradle.common", version.ref = "tools" }
-gradle-project = { id = "ru.mipt.npm.gradle.project", version.ref = "tools" }
+gradle-project = { id = "space.kscience.gradle.project", version.ref = "tools" }
-gradle-mpp = { id = "ru.mipt.npm.gradle.mpp", version.ref = "tools" }
+gradle-mpp = { id = "space.kscience.gradle.mpp", version.ref = "tools" }
-gradle-jvm = { id = "ru.mipt.npm.gradle.jvm", version.ref = "tools" }
+gradle-jvm = { id = "space.kscience.gradle.jvm", version.ref = "tools" }
-gradle-js = { id = "ru.mipt.npm.gradle.js", version.ref = "tools" }
+gradle-js = { id = "space.kscience.gradle.js", version.ref = "tools" }
-gradle-native = { id = "ru.mipt.npm.gradle.native", version.ref = "tools" }
+gradle-native = { id = "space.kscience.gradle.native", version.ref = "tools" }
-gradle-node = { id = "ru.mipt.npm.gradle.node", version.ref = "tools" }
+gradle-node = { id = "space.kscience.gradle.node", version.ref = "tools" }
 
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-android-extensions = { id = "org.jetbrains.kotlin.android.extensions", version.ref = "kotlin" }

src/main/kotlin/space/kscience/gradle/KScienceCommonPlugin.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

src/main/kotlin/space/kscience/gradle/KScienceExtension.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import org.gradle.api.Project
 import org.gradle.api.plugins.ApplicationPlugin
@@ -11,9 +11,9 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlinx.jupyter.api.plugin.tasks.JupyterApiResourcesTask
-import ru.mipt.npm.gradle.internal.defaultPlatform
+import space.kscience.gradle.internal.defaultPlatform
-import ru.mipt.npm.gradle.internal.useCommonDependency
+import space.kscience.gradle.internal.useCommonDependency
-import ru.mipt.npm.gradle.internal.useFx
+import space.kscience.gradle.internal.useFx
 
 public enum class FXModule(public val artifact: String, public vararg val dependencies: FXModule) {
     BASE("javafx-base"),

src/main/kotlin/space/kscience/gradle/KScienceJSPlugin.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

src/main/kotlin/space/kscience/gradle/KScienceJVMPlugin.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

src/main/kotlin/space/kscience/gradle/KScienceNativePlugin.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

src/main/kotlin/space/kscience/gradle/KScienceNodePlugin.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import kotlinx.validation.ApiValidationExtension
 import kotlinx.validation.BinaryCompatibilityValidatorPlugin
@@ -10,7 +10,7 @@ import org.jetbrains.changelog.ChangelogPlugin
 import org.jetbrains.changelog.ChangelogPluginExtension
 import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.dokka.gradle.DokkaPlugin
-import ru.mipt.npm.gradle.internal.*
+import space.kscience.gradle.internal.*
 
 /**
  * Simplifies adding repositories for Maven publishing, responds for releasing tasks for projects.
@@ -241,6 +241,17 @@ public open class KScienceProjectPlugin : Plugin<Project> {
             dependsOn(generateReadme)
         }
 
+        tasks.create("version") {
+            group = "publishing"
+            val versionFile = project.buildDir.resolve("project-version.txt")
+            outputs.file(versionFile)
+            doLast {
+                versionFile.createNewFile()
+                versionFile.writeText(project.version.toString())
+                println(project.version)
+            }
+        }
+
         allprojects {
             afterEvaluate {
                 ksciencePublish.repositoryNames.forEach { repositoryName ->

src/main/kotlin/space/kscience/gradle/KScienceReadmeExtension.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import freemarker.cache.StringTemplateLoader
 import freemarker.template.Configuration

src/main/kotlin/space/kscience/gradle/KScienceVersions.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 
 import org.gradle.api.JavaVersion

src/main/kotlin/space/kscience/gradle/SerializationTargets.kt

@@ -1,7 +1,7 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import org.gradle.api.Project
-import ru.mipt.npm.gradle.internal.useCommonDependency
+import space.kscience.gradle.internal.useCommonDependency
 
 public class SerializationTargets(
     public val sourceSet: DependencySourceSet,

src/main/kotlin/space/kscience/gradle/commonConfigurations.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle
+package space.kscience.gradle
 
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import ru.mipt.npm.gradle.internal.applyRepos
+import space.kscience.gradle.internal.applyRepos
-import ru.mipt.npm.gradle.internal.applySettings
+import space.kscience.gradle.internal.applySettings
-import ru.mipt.npm.gradle.internal.fromJsDependencies
+import space.kscience.gradle.internal.fromJsDependencies
 
 
 private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy", "-Xjdk-release=${KScienceVersions.JVM_TARGET}")
@@ -63,7 +63,9 @@ public fun Project.configureKScience(
             js(IR) {
                 browser {
                     commonWebpackConfig {
-                        cssSupport.enabled = true
+                        cssSupport{
+                            enabled = true
+                        }
                     }
                 }
             }
@@ -107,7 +109,9 @@ public fun Project.configureKScience(
             js(IR) {
                 browser {
                     commonWebpackConfig {
-                        cssSupport.enabled = true
+                        cssSupport{
+                            enabled = true
+                        }
                     }
                 }
             }

src/main/kotlin/space/kscience/gradle/internal/common.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle.internal
+package space.kscience.gradle.internal
 
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.dsl.RepositoryHandler

src/main/kotlin/space/kscience/gradle/internal/dependencies.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle.internal
+package space.kscience.gradle.internal
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -6,8 +6,8 @@ import org.gradle.kotlin.dsl.invoke
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import ru.mipt.npm.gradle.DependencyConfiguration
+import space.kscience.gradle.DependencyConfiguration
-import ru.mipt.npm.gradle.DependencySourceSet
+import space.kscience.gradle.DependencySourceSet
 
 internal fun Project.useDependency(
     vararg pairs: Pair<String, String>,

src/main/kotlin/space/kscience/gradle/internal/fx.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle.internal
+package space.kscience.gradle.internal
 
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.api.Project
@@ -6,9 +6,9 @@ import org.gradle.kotlin.dsl.findByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
-import ru.mipt.npm.gradle.DependencyConfiguration
+import space.kscience.gradle.DependencyConfiguration
-import ru.mipt.npm.gradle.FXModule
+import space.kscience.gradle.FXModule
-import ru.mipt.npm.gradle.FXPlatform
+import space.kscience.gradle.FXPlatform
 
 internal val defaultPlatform: FXPlatform = when {
     Os.isFamily(Os.FAMILY_WINDOWS) -> FXPlatform.WINDOWS

src/main/kotlin/space/kscience/gradle/internal/publishing.kt

@@ -1,4 +1,4 @@
-package ru.mipt.npm.gradle.internal
+package space.kscience.gradle.internal
 
 import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
@@ -10,7 +10,7 @@ import org.gradle.plugins.signing.SigningExtension
 import org.gradle.plugins.signing.SigningPlugin
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.targets
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.targets
 
 internal fun Project.requestPropertyOrNull(propertyName: String): String? = findProperty(propertyName) as? String
     ?: System.getenv(propertyName)

src/test/kotlin/TestVersions.kt

@@ -1,6 +1,5 @@
-package ru.mipt.npm.gradle
-
 import org.junit.jupiter.api.Test
+import space.kscience.gradle.KScienceVersions
 
 class TestPlugins {
     @Test