[Gradle] Avoid using dependsOn and add output provider to the file collection
This commit is contained in:
committed by
TeamCityServer
parent
e6c089ef40
commit
2666a93e6a
+1
-1
@@ -233,7 +233,7 @@ abstract class AbstractKotlinCompilation<T : KotlinCommonOptions>(
|
||||
// that depends on this module's production part, include the main artifact in the friend artifacts, lazily:
|
||||
files(
|
||||
Callable {
|
||||
friendArtifactsTaskProvider.get().archivePathCompatible
|
||||
friendArtifactsTaskProvider.flatMap { it.archiveFile }
|
||||
}
|
||||
)
|
||||
} else files()
|
||||
|
||||
-9
@@ -304,15 +304,6 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
|
||||
taskData.compilation.moduleName
|
||||
}
|
||||
|
||||
init {
|
||||
if (taskData.compilation is AbstractKotlinCompilation<*> &&
|
||||
(taskData.compilation as AbstractKotlinCompilation<*>).friendArtifactsTask != null) {
|
||||
this@AbstractKotlinCompile.dependsOn(
|
||||
(taskData.compilation as AbstractKotlinCompilation<*>).friendArtifactsTask
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@get:Internal // takes part in the compiler arguments
|
||||
val friendPaths: FileCollection = project.files(
|
||||
project.provider {
|
||||
|
||||
Reference in New Issue
Block a user