From 0b6959ee3d88a22267ba1e949e4bb95587fc8752 Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Fri, 16 Oct 2020 01:26:48 +0300
Subject: [PATCH] [Gradle, K/N] Deprecate K/N compile classpath prop in favor
 of libraries

---
 .../jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt | 2 +-
 .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
index 6d93a2dffb9..f6b50ef7ce8 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
@@ -297,7 +297,7 @@ fun BaseGradleIT.Project.checkTaskCompileClasspath(
     val subproject = taskPath.substringBeforeLast(":").takeIf { it.isNotEmpty() && it != taskPath }
     val taskName = taskPath.removePrefix(subproject.orEmpty())
     val taskClass = if (isNative) "org.jetbrains.kotlin.gradle.tasks.AbstractKotlinNativeCompile<*, *>" else "AbstractCompile"
-    val expression = """(tasks.getByName("$taskName") as $taskClass).classpath.toList()"""
+    val expression = """(tasks.getByName("$taskName") as $taskClass).${if (isNative) "libraries" else "classpath"}.toList()"""
     checkPrintedItems(subproject, expression, checkModulesInClasspath, checkModulesNotInClasspath)
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 0c02b22e374..329bbd7da68 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -146,6 +146,7 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : Abst
     }
 
     @get:Internal
+    @get:Deprecated("Use libraries instead", ReplaceWith("libraries"))
     val classpath: FileCollection
         get() = libraries
 
@@ -543,7 +544,6 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
     val processTests: Boolean
         @Input get() = binary is TestExecutable
 
-    @get:InputFiles
     @get:Classpath
     val exportLibraries: FileCollection
         get() = binary.let {
@@ -927,10 +927,6 @@ open class CInteropProcess : DefaultTask() {
     val outputFileProvider: Provider<File> =
         project.provider { destinationDir.get().resolve(outputFileName) }
 
-    @OutputDirectory
-    val outputDirectoryProvider: Provider<File> =
-        project.provider { destinationDir.get().resolve("$outputFileName-build") }
-
     @get:InputFile
     @get:PathSensitive(PathSensitivity.RELATIVE)
     val defFile: File