From f6e27eebdde96a5aa8a49279a2dd9cfe415981a0 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 29 Jul 2022 14:46:22 +0300 Subject: [PATCH] Migrate to new package and Kotlin 1.7.20-Beta --- CHANGELOG.md | 1 + README.md | 26 +++++++------- build.gradle.kts | 35 ++++++++++--------- gradle/libs.versions.toml | 18 +++++----- .../kscience}/gradle/KScienceCommonPlugin.kt | 2 +- .../kscience}/gradle/KScienceExtension.kt | 8 ++--- .../kscience}/gradle/KScienceJSPlugin.kt | 2 +- .../kscience}/gradle/KScienceJVMPlugin.kt | 2 +- .../kscience}/gradle/KScienceMPPlugin.kt | 2 +- .../kscience}/gradle/KScienceNativePlugin.kt | 2 +- .../kscience}/gradle/KScienceNodePlugin.kt | 2 +- .../kscience}/gradle/KScienceProjectPlugin.kt | 15 ++++++-- .../gradle/KScienceReadmeExtension.kt | 2 +- .../kscience}/gradle/KScienceVersions.kt | 2 +- .../kscience}/gradle/SerializationTargets.kt | 4 +-- .../kscience}/gradle/commonConfigurations.kt | 16 +++++---- .../kscience}/gradle/internal/common.kt | 2 +- .../kscience}/gradle/internal/dependencies.kt | 6 ++-- .../kscience}/gradle/internal/fx.kt | 8 ++--- .../kscience}/gradle/internal/publishing.kt | 4 +-- src/test/kotlin/TestVersions.kt | 3 +- 21 files changed, 89 insertions(+), 73 deletions(-) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceCommonPlugin.kt (88%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceExtension.kt (97%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceJSPlugin.kt (93%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceJVMPlugin.kt (93%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceMPPlugin.kt (95%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceNativePlugin.kt (98%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceNodePlugin.kt (98%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceProjectPlugin.kt (95%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceReadmeExtension.kt (99%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/KScienceVersions.kt (97%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/SerializationTargets.kt (94%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/commonConfigurations.kt (92%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/internal/common.kt (98%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/internal/dependencies.kt (97%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/internal/fx.kt (92%) rename src/main/kotlin/{ru/mipt/npm => space/kscience}/gradle/internal/publishing.kt (98%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8403843..6f986d6 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 24c21ce..836d16d 100644 --- a/README.md +++ b/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 -`= 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` diff --git a/build.gradle.kts b/build.gradle.kts index e7b8fc2..00436aa 100644 --- a/build.gradle.kts +++ b/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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0fb2c45..23bbb5a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.11.8-kotlin-1.7.10" -kotlin = "1.7.10" +tools = "0.12.0-kotlin-1.7.20-Beta" +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-project = { id = "ru.mipt.npm.gradle.project", version.ref = "tools" } -gradle-mpp = { id = "ru.mipt.npm.gradle.mpp", version.ref = "tools" } -gradle-jvm = { id = "ru.mipt.npm.gradle.jvm", version.ref = "tools" } -gradle-js = { id = "ru.mipt.npm.gradle.js", version.ref = "tools" } -gradle-native = { id = "ru.mipt.npm.gradle.native", version.ref = "tools" } -gradle-node = { id = "ru.mipt.npm.gradle.node", version.ref = "tools" } +gradle-common = { id = "space.kscience.gradle.common", version.ref = "tools" } +gradle-project = { id = "space.kscience.gradle.project", version.ref = "tools" } +gradle-mpp = { id = "space.kscience.gradle.mpp", version.ref = "tools" } +gradle-jvm = { id = "space.kscience.gradle.jvm", version.ref = "tools" } +gradle-js = { id = "space.kscience.gradle.js", version.ref = "tools" } +gradle-native = { id = "space.kscience.gradle.native", 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" } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceCommonPlugin.kt similarity index 88% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt rename to src/main/kotlin/space/kscience/gradle/KScienceCommonPlugin.kt index 331f4e2..562aaad 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt +++ b/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 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt similarity index 97% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt rename to src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index 9563811..75c36d5 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt +++ b/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 ru.mipt.npm.gradle.internal.useCommonDependency -import ru.mipt.npm.gradle.internal.useFx +import space.kscience.gradle.internal.defaultPlatform +import space.kscience.gradle.internal.useCommonDependency +import space.kscience.gradle.internal.useFx public enum class FXModule(public val artifact: String, public vararg val dependencies: FXModule) { BASE("javafx-base"), diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceJSPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceJSPlugin.kt similarity index 93% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceJSPlugin.kt rename to src/main/kotlin/space/kscience/gradle/KScienceJSPlugin.kt index dabc588..a2fd328 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceJSPlugin.kt +++ b/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 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceJVMPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceJVMPlugin.kt similarity index 93% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceJVMPlugin.kt rename to src/main/kotlin/space/kscience/gradle/KScienceJVMPlugin.kt index 773d148..55caf90 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceJVMPlugin.kt +++ b/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 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceMPPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt similarity index 95% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceMPPlugin.kt rename to src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt index 6ee5518..4da79c2 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceMPPlugin.kt +++ b/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 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNativePlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceNativePlugin.kt similarity index 98% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceNativePlugin.kt rename to src/main/kotlin/space/kscience/gradle/KScienceNativePlugin.kt index 45b1865..63198c9 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNativePlugin.kt +++ b/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 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceNodePlugin.kt similarity index 98% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt rename to src/main/kotlin/space/kscience/gradle/KScienceNodePlugin.kt index b3ebb78..4eedc80 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt +++ b/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 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt similarity index 95% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt rename to src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt index 22f7ec6..dcf0475 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/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 { 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 -> diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceReadmeExtension.kt similarity index 99% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt rename to src/main/kotlin/space/kscience/gradle/KScienceReadmeExtension.kt index 1ba3785..eec7597 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt +++ b/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 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/space/kscience/gradle/KScienceVersions.kt similarity index 97% rename from src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt rename to src/main/kotlin/space/kscience/gradle/KScienceVersions.kt index 296ad2d..d76fe3d 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/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 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt b/src/main/kotlin/space/kscience/gradle/SerializationTargets.kt similarity index 94% rename from src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt rename to src/main/kotlin/space/kscience/gradle/SerializationTargets.kt index 1ef2351..134e022 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt +++ b/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, diff --git a/src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt b/src/main/kotlin/space/kscience/gradle/commonConfigurations.kt similarity index 92% rename from src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt rename to src/main/kotlin/space/kscience/gradle/commonConfigurations.kt index a732072..6f3f4bc 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt +++ b/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 ru.mipt.npm.gradle.internal.applySettings -import ru.mipt.npm.gradle.internal.fromJsDependencies +import space.kscience.gradle.internal.applyRepos +import space.kscience.gradle.internal.applySettings +import space.kscience.gradle.internal.fromJsDependencies private val defaultJvmArgs: List = 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 + } } } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt b/src/main/kotlin/space/kscience/gradle/internal/common.kt similarity index 98% rename from src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt rename to src/main/kotlin/space/kscience/gradle/internal/common.kt index 673d2a1..864e613 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt +++ b/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 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/dependencies.kt b/src/main/kotlin/space/kscience/gradle/internal/dependencies.kt similarity index 97% rename from src/main/kotlin/ru/mipt/npm/gradle/internal/dependencies.kt rename to src/main/kotlin/space/kscience/gradle/internal/dependencies.kt index 9280846..cf37482 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/dependencies.kt +++ b/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 ru.mipt.npm.gradle.DependencySourceSet +import space.kscience.gradle.DependencyConfiguration +import space.kscience.gradle.DependencySourceSet internal fun Project.useDependency( vararg pairs: Pair, diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/fx.kt b/src/main/kotlin/space/kscience/gradle/internal/fx.kt similarity index 92% rename from src/main/kotlin/ru/mipt/npm/gradle/internal/fx.kt rename to src/main/kotlin/space/kscience/gradle/internal/fx.kt index c64c81b..2733f46 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/fx.kt +++ b/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 ru.mipt.npm.gradle.FXModule -import ru.mipt.npm.gradle.FXPlatform +import space.kscience.gradle.DependencyConfiguration +import space.kscience.gradle.FXModule +import space.kscience.gradle.FXPlatform internal val defaultPlatform: FXPlatform = when { Os.isFamily(Os.FAMILY_WINDOWS) -> FXPlatform.WINDOWS diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt b/src/main/kotlin/space/kscience/gradle/internal/publishing.kt similarity index 98% rename from src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt rename to src/main/kotlin/space/kscience/gradle/internal/publishing.kt index 2b6e6b6..fd45e3c 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt +++ b/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) diff --git a/src/test/kotlin/TestVersions.kt b/src/test/kotlin/TestVersions.kt index 4d88b50..5c02703 100644 --- a/src/test/kotlin/TestVersions.kt +++ b/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