[Gradle, K/N] Deprecate K/N compile classpath prop in favor of libraries
This commit is contained in:
+1
-1
@@ -297,7 +297,7 @@ fun BaseGradleIT.Project.checkTaskCompileClasspath(
|
|||||||
val subproject = taskPath.substringBeforeLast(":").takeIf { it.isNotEmpty() && it != taskPath }
|
val subproject = taskPath.substringBeforeLast(":").takeIf { it.isNotEmpty() && it != taskPath }
|
||||||
val taskName = taskPath.removePrefix(subproject.orEmpty())
|
val taskName = taskPath.removePrefix(subproject.orEmpty())
|
||||||
val taskClass = if (isNative) "org.jetbrains.kotlin.gradle.tasks.AbstractKotlinNativeCompile<*, *>" else "AbstractCompile"
|
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)
|
checkPrintedItems(subproject, expression, checkModulesInClasspath, checkModulesNotInClasspath)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-5
@@ -146,6 +146,7 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions, K : Abst
|
|||||||
}
|
}
|
||||||
|
|
||||||
@get:Internal
|
@get:Internal
|
||||||
|
@get:Deprecated("Use libraries instead", ReplaceWith("libraries"))
|
||||||
val classpath: FileCollection
|
val classpath: FileCollection
|
||||||
get() = libraries
|
get() = libraries
|
||||||
|
|
||||||
@@ -543,7 +544,6 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
|
|||||||
val processTests: Boolean
|
val processTests: Boolean
|
||||||
@Input get() = binary is TestExecutable
|
@Input get() = binary is TestExecutable
|
||||||
|
|
||||||
@get:InputFiles
|
|
||||||
@get:Classpath
|
@get:Classpath
|
||||||
val exportLibraries: FileCollection
|
val exportLibraries: FileCollection
|
||||||
get() = binary.let {
|
get() = binary.let {
|
||||||
@@ -927,10 +927,6 @@ open class CInteropProcess : DefaultTask() {
|
|||||||
val outputFileProvider: Provider<File> =
|
val outputFileProvider: Provider<File> =
|
||||||
project.provider { destinationDir.get().resolve(outputFileName) }
|
project.provider { destinationDir.get().resolve(outputFileName) }
|
||||||
|
|
||||||
@OutputDirectory
|
|
||||||
val outputDirectoryProvider: Provider<File> =
|
|
||||||
project.provider { destinationDir.get().resolve("$outputFileName-build") }
|
|
||||||
|
|
||||||
@get:InputFile
|
@get:InputFile
|
||||||
@get:PathSensitive(PathSensitivity.RELATIVE)
|
@get:PathSensitive(PathSensitivity.RELATIVE)
|
||||||
val defFile: File
|
val defFile: File
|
||||||
|
|||||||
Reference in New Issue
Block a user