From 9d8e7991a84222abef7db0e3ba4e059efdf627b7 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 6 Mar 2023 15:29:56 +0400 Subject: [PATCH] [Gradle, JS] Remove redundant fields inside NpmDependency --- .../kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt | 2 +- .../kotlin/gradle/targets/js/npm/NpmDependency.kt | 5 ----- .../kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt | 2 +- .../js/npm/resolver/KotlinCompilationNpmResolution.kt | 6 +++--- .../js/npm/resolver/KotlinCompilationNpmResolver.kt | 2 +- .../kotlin/gradle/targets/js/yarn/YarnSetupTask.kt | 7 +++---- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt index 92fd3e3552a..8db0551fc1a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt @@ -47,7 +47,7 @@ open class NodeJsRootExtension( } val rootProjectDir - get() = project.projectDir + get() = project.rootDir private val gradleHome = project.gradle.gradleUserHomeDir.also { project.logger.kotlinInfo("Storing cached files in $it") diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt index dcdad1ff8df..368f9bbfb6f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt @@ -38,11 +38,6 @@ data class NpmDependency( override fun getVersion() = version - internal var parent: NpmDependency? = null - internal val dependencies = mutableSetOf() - internal var resolvedVersion: String? = null - internal var integrity: String? = null - override fun resolve(transitive: Boolean): Set = resolve() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt index 3a947c43dd5..1635f87019d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt @@ -50,7 +50,7 @@ abstract class PublicPackageJsonTask : private val compilationResolution get() = npmResolutionManager.get().resolution.get()[projectPath][compilationDisambiguatedName.get()] - .getResolutionOrResolve( + .getResolutionOrPrepare( npmResolutionManager.get(), logger ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt index 0d55b6c24e0..69268965d74 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt @@ -61,7 +61,7 @@ class KotlinCompilationNpmResolution( } @Synchronized - fun getResolutionOrResolve( + fun getResolutionOrPrepare( npmResolutionManager: KotlinNpmResolutionManager, logger: Logger, ): PreparedKotlinCompilationNpmResolution { @@ -80,7 +80,7 @@ class KotlinCompilationNpmResolution( ): PreparedKotlinCompilationNpmResolution { check(!closed) { "$this already closed" } closed = true - return getResolutionOrResolve(npmResolutionManager, logger) + return getResolutionOrPrepare(npmResolutionManager, logger) } fun createPreparedResolution( @@ -92,7 +92,7 @@ class KotlinCompilationNpmResolution( internalDependencies.map { val compilationNpmResolution: KotlinCompilationNpmResolution = rootResolver[it.projectPath][it.compilationName] - compilationNpmResolution.getResolutionOrResolve( + compilationNpmResolution.getResolutionOrPrepare( npmResolutionManager, logger ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt index d65c098eefa..834bf561867 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt @@ -109,7 +109,7 @@ class KotlinCompilationNpmResolver( return _compilationNpmResolution } - fun createAggregatedConfiguration(): Configuration { + private fun createAggregatedConfiguration(): Configuration { val all = project.configurations.create(compilation.disambiguateName("npm")) all.usesPlatformOf(target) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt index c801ed92592..ded62a2d722 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt @@ -29,14 +29,13 @@ abstract class YarnSetupTask : DefaultTask() { private val shouldDownload = settings.download @get:Inject - abstract internal val archiveOperations: ArchiveOperations + internal abstract val archiveOperations: ArchiveOperations @get:Inject - abstract internal val fileHasher: FileHasher + internal abstract val fileHasher: FileHasher @get:Inject - internal open val fs: FileSystemOperations - get() = error("Should be injected") + internal abstract val fs: FileSystemOperations @Suppress("MemberVisibilityCanBePrivate") val downloadUrl