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

CInteropCommonizerTask: Mark dependency on commonized native distribution as @Classpath

Browse Source
This commit is contained in:
sebastian.sellmair
2021-04-19 14:37:54 +02:00
committed by Space
parent f4617b2c03
commit 3c4d0a1814
2 changed files with 10 additions and 5 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/native/internal/CInteropCommonizerTask.kt
+9 -4
View File
@@ -48,10 +48,15 @@ internal open class CInteropCommonizerTask : AbstractCInteropCommonizerTask() {
internal var cinterops = setOf<CInteropGist>() internal var cinterops = setOf<CInteropGist>()
private set private set
@OutputDirectories @get:OutputDirectories
fun getAllOutputDirectories(): Set<File> { val allOutputDirectories: Set<File>
return getCommonizationParameters().map { outputDirectory(it) }.toSet() get() = getCommonizationParameters().map { outputDirectory(it) }.toSet()
}
@Suppress("unused") // Used for UP-TO-DATE check
@get:InputFiles
@get:Classpath
val commonizedNativeDistributionDependencies: Set<File>
get() = getCommonizationParameters().flatMap { nativeDistributionDependencies(it) }.map { it.file }.toSet()
fun from(vararg tasks: CInteropProcess) = from( fun from(vararg tasks: CInteropProcess) = from(
tasks.toList() tasks.toList()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CopyCInteropCommonizerTaskOutputForIdeTask.kt
+1 -1
View File
@@ -18,7 +18,7 @@ internal open class CopyCommonizeCInteropForIdeTask : AbstractCInteropCommonizer
@get:InputFiles @get:InputFiles
@get:PathSensitive(PathSensitivity.ABSOLUTE) @get:PathSensitive(PathSensitivity.ABSOLUTE)
val cInteropCommonizerTaskOutputDirectories: Provider<Set<File>> = val cInteropCommonizerTaskOutputDirectories: Provider<Set<File>> =
commonizeCInteropTask.map { it.getAllOutputDirectories() } commonizeCInteropTask.map { it.allOutputDirectories }
@get:OutputDirectory @get:OutputDirectory
override val outputDirectory: File = project.rootDir.resolve(".gradle/kotlin/commonizer") override val outputDirectory: File = project.rootDir.resolve(".gradle/kotlin/commonizer")