azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Fix naming

Browse Source
This commit is contained in:
Ilya Goncharov
2023-02-15 13:36:17 +01:00
committed by Space Team
parent e570f97db2
commit 234ffb4644
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt
+4 -4
View File
@@ -44,14 +44,14 @@ class KotlinCompilationNpmResolution(
private var resolution: PreparedKotlinCompilationNpmResolution? = null private var resolution: PreparedKotlinCompilationNpmResolution? = null
@Synchronized @Synchronized
fun resolve( fun prepareWithDependencies(
skipWriting: Boolean = false, skipWriting: Boolean = false,
npmResolutionManager: KotlinNpmResolutionManager, npmResolutionManager: KotlinNpmResolutionManager,
logger: Logger logger: Logger
): PreparedKotlinCompilationNpmResolution { ): PreparedKotlinCompilationNpmResolution {
check(resolution == null) { "$this already resolved" } check(resolution == null) { "$this already resolved" }
return createPackageJson( return createPreparedResolution(
skipWriting, skipWriting,
npmResolutionManager, npmResolutionManager,
logger logger
@@ -66,7 +66,7 @@ class KotlinCompilationNpmResolution(
logger: Logger, logger: Logger,
): PreparedKotlinCompilationNpmResolution { ): PreparedKotlinCompilationNpmResolution {
return resolution ?: resolve( return resolution ?: prepareWithDependencies(
skipWriting = true, skipWriting = true,
npmResolutionManager, npmResolutionManager,
logger logger
@@ -83,7 +83,7 @@ class KotlinCompilationNpmResolution(
return getResolutionOrResolve(npmResolutionManager, logger) return getResolutionOrResolve(npmResolutionManager, logger)
} }
fun createPackageJson( fun createPreparedResolution(
skipWriting: Boolean, skipWriting: Boolean,
npmResolutionManager: KotlinNpmResolutionManager, npmResolutionManager: KotlinNpmResolutionManager,
logger: Logger logger: Logger
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt
+1 -1
View File
@@ -87,7 +87,7 @@ abstract class KotlinPackageJsonTask :
@TaskAction @TaskAction
fun resolve() { fun resolve() {
npmResolutionManager.get().resolution.get()[projectPath][compilationDisambiguatedName.get()] npmResolutionManager.get().resolution.get()[projectPath][compilationDisambiguatedName.get()]
.resolve( .prepareWithDependencies(
npmResolutionManager = npmResolutionManager.get(), npmResolutionManager = npmResolutionManager.get(),
logger = logger logger = logger
) )