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
2020-03-06 10:53:21 +03:00
parent 2eea8b0760
commit 49814c438c
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmApi.kt
+1 -1
View File
@@ -24,7 +24,7 @@ interface NpmApi {
) )
fun resolveDependency( fun resolveDependency(
resolvedNpmProject: KotlinCompilationNpmResolution, npmResolution: KotlinCompilationNpmResolution,
dependency: NpmDependency, dependency: NpmDependency,
transitive: Boolean transitive: Boolean
): Set<File> ): Set<File>
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/Yarn.kt
+3 -3
View File
@@ -22,12 +22,12 @@ object Yarn : NpmApi {
getDelegate(resolvedNpmProject.project).resolveProject(resolvedNpmProject) getDelegate(resolvedNpmProject.project).resolveProject(resolvedNpmProject)
override fun resolveDependency( override fun resolveDependency(
resolvedNpmProject: KotlinCompilationNpmResolution, npmResolution: KotlinCompilationNpmResolution,
dependency: NpmDependency, dependency: NpmDependency,
transitive: Boolean transitive: Boolean
) = getDelegate(resolvedNpmProject.project) ) = getDelegate(npmResolution.project)
.resolveDependency( .resolveDependency(
resolvedNpmProject, npmResolution,
dependency, dependency,
transitive transitive
) )
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
+3 -3
View File
@@ -41,7 +41,7 @@ abstract class YarnBasics : NpmApi {
} }
override fun resolveDependency( override fun resolveDependency(
resolvedNpmProject: KotlinCompilationNpmResolution, npmResolution: KotlinCompilationNpmResolution,
dependency: NpmDependency, dependency: NpmDependency,
transitive: Boolean transitive: Boolean
): Set<File> { ): Set<File> {
@@ -51,7 +51,7 @@ abstract class YarnBasics : NpmApi {
return files return files
} }
val npmProject = resolvedNpmProject.npmProject val npmProject = npmResolution.npmProject
val all = mutableSetOf<File>() val all = mutableSetOf<File>()
@@ -73,7 +73,7 @@ abstract class YarnBasics : NpmApi {
if (transitive) { if (transitive) {
dependency.dependencies.forEach { dependency.dependencies.forEach {
resolveDependency( resolveDependency(
resolvedNpmProject, npmResolution,
it, it,
transitive transitive
).also { files -> ).also { files ->