From db90c9cc888a87937af57624055fa8fdbad74a19 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 10 Sep 2020 17:05:12 +0300 Subject: [PATCH] [Gradle, JS] Move from NpmVersions --- .../targets/js/KotlinGradleNpmPackage.kt | 15 ++++++++++++++ .../gradle/targets/js/NpmPackageVersion.kt | 15 ++++++++++++++ .../kotlin/gradle/targets/js/NpmVersions.kt | 20 +------------------ .../targets/js/RequiredKotlinJsDependency.kt | 14 +++++++++++++ 4 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinGradleNpmPackage.kt create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmPackageVersion.kt create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/RequiredKotlinJsDependency.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinGradleNpmPackage.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinGradleNpmPackage.kt new file mode 100644 index 00000000000..fdca551328a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinGradleNpmPackage.kt @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.targets.js + +import org.gradle.api.Project +import org.gradle.api.artifacts.Dependency +import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency + +data class KotlinGradleNpmPackage(val simpleModuleName: String) : RequiredKotlinJsDependency { + override fun createDependency(project: Project, scope: NpmDependency.Scope): Dependency = + project.dependencies.create("org.jetbrains.kotlin:kotlin-$simpleModuleName") +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmPackageVersion.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmPackageVersion.kt new file mode 100644 index 00000000000..7d1968fa44f --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmPackageVersion.kt @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.targets.js + +import org.gradle.api.Project +import org.gradle.api.artifacts.Dependency +import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency + +data class NpmPackageVersion(val name: String, var version: String) : RequiredKotlinJsDependency { + override fun createDependency(project: Project, scope: NpmDependency.Scope): Dependency = + NpmDependency(project, name, version, scope) +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt index 55d10de12d7..4ab40f6287d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt @@ -5,10 +5,6 @@ package org.jetbrains.kotlin.gradle.targets.js -import org.gradle.api.Project -import org.gradle.api.artifacts.Dependency -import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency - /** * Package versions used by tasks */ @@ -46,18 +42,4 @@ class NpmVersions { val karmaSourceMapLoader = NpmPackageVersion("karma-sourcemap-loader", "0.3.7") val kotlinJsTestRunner = KotlinGradleNpmPackage("test-js-runner") -} - -interface RequiredKotlinJsDependency { - fun createDependency(project: Project, scope: NpmDependency.Scope = NpmDependency.Scope.DEV): Dependency -} - -data class NpmPackageVersion(val name: String, var version: String) : RequiredKotlinJsDependency { - override fun createDependency(project: Project, scope: NpmDependency.Scope): Dependency = - NpmDependency(project, name, version, scope) -} - -data class KotlinGradleNpmPackage(val simpleModuleName: String) : RequiredKotlinJsDependency { - override fun createDependency(project: Project, scope: NpmDependency.Scope): Dependency = - project.dependencies.create("org.jetbrains.kotlin:kotlin-$simpleModuleName") -} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/RequiredKotlinJsDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/RequiredKotlinJsDependency.kt new file mode 100644 index 00000000000..27ee560db82 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/RequiredKotlinJsDependency.kt @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.targets.js + +import org.gradle.api.Project +import org.gradle.api.artifacts.Dependency +import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency + +interface RequiredKotlinJsDependency { + fun createDependency(project: Project, scope: NpmDependency.Scope = NpmDependency.Scope.DEV): Dependency +} \ No newline at end of file