[Gradle] Fix CInteropCommonizerTask.CInteropCommonizerDependencies.dependencies resolving to early
^KT-54202 Verification Pending
This commit is contained in:
committed by
teamcity
parent
c561b1a861
commit
05700e09f4
+1
-11
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.gradle.plugin.sources.withDependsOnClosure
|
|||||||
import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropCommonizerTask.CInteropGist
|
import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropCommonizerTask.CInteropGist
|
||||||
import org.jetbrains.kotlin.gradle.tasks.CInteropProcess
|
import org.jetbrains.kotlin.gradle.tasks.CInteropProcess
|
||||||
import org.jetbrains.kotlin.gradle.utils.chainedFinalizeValueOnRead
|
import org.jetbrains.kotlin.gradle.utils.chainedFinalizeValueOnRead
|
||||||
import org.jetbrains.kotlin.gradle.utils.filesProvider
|
|
||||||
import org.jetbrains.kotlin.gradle.utils.listProperty
|
import org.jetbrains.kotlin.gradle.utils.listProperty
|
||||||
import org.jetbrains.kotlin.gradle.utils.property
|
import org.jetbrains.kotlin.gradle.utils.property
|
||||||
import org.jetbrains.kotlin.konan.target.KonanTarget
|
import org.jetbrains.kotlin.konan.target.KonanTarget
|
||||||
@@ -150,11 +149,9 @@ internal open class CInteropCommonizerTask
|
|||||||
.map { sourceSet -> project.createCInteropMetadataDependencyClasspath(sourceSet) }
|
.map { sourceSet -> project.createCInteropMetadataDependencyClasspath(sourceSet) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val nativeDistributionDependencyFiles = project.getNativeDistributionDependencies(target)
|
|
||||||
|
|
||||||
CInteropCommonizerDependencies(
|
CInteropCommonizerDependencies(
|
||||||
target,
|
target, project.files(externalDependencyFiles, project.getNativeDistributionDependencies(target))
|
||||||
project.files(externalDependencyFiles + nativeDistributionDependencyFiles)
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -175,13 +172,6 @@ internal open class CInteropCommonizerTask
|
|||||||
val allOutputDirectories: Set<File>
|
val allOutputDirectories: Set<File>
|
||||||
get() = getAllInteropsGroups().map { outputDirectory(it) }.toSet()
|
get() = getAllInteropsGroups().map { outputDirectory(it) }.toSet()
|
||||||
|
|
||||||
@Suppress("unused") // Used for UP-TO-DATE check
|
|
||||||
@get:Classpath
|
|
||||||
val commonizedNativeDistributionDependencies: Set<File>
|
|
||||||
get() = getAllInteropsGroups().flatMap { group -> group.targets }
|
|
||||||
.flatMap { target -> project.getNativeDistributionDependencies(target) }
|
|
||||||
.toSet()
|
|
||||||
|
|
||||||
fun from(vararg tasks: CInteropProcess) = from(
|
fun from(vararg tasks: CInteropProcess) = from(
|
||||||
tasks.toList()
|
tasks.toList()
|
||||||
.onEach { task -> this.dependsOn(task) }
|
.onEach { task -> this.dependsOn(task) }
|
||||||
|
|||||||
Reference in New Issue
Block a user