@@ -234,7 +234,7 @@ private fun Project.configureKotlinCompilation(
234234 }
235235 outputApiFile = apiBuildDir.get().resolve(dumpFileName)
236236 }
237- configureCheckTasks(apiBuildDir, apiBuild, extension, targetConfig, commonApiDump, commonApiCheck)
237+ configureCheckTasks(apiBuild, extension, targetConfig, commonApiDump, commonApiCheck)
238238}
239239
240240internal val Project .sourceSets: SourceSetContainer
@@ -277,12 +277,11 @@ private fun Project.configureApiTasks(
277277 outputApiFile = apiBuildDir.get().resolve(dumpFileName)
278278 }
279279
280- configureCheckTasks(apiBuildDir, apiBuild, extension, targetConfig)
280+ configureCheckTasks(apiBuild, extension, targetConfig)
281281}
282282
283283private fun Project.configureCheckTasks (
284- apiBuildDir : Provider <File >,
285- apiBuild : TaskProvider <* >,
284+ apiBuild : TaskProvider <KotlinApiBuildTask >,
286285 extension : ApiValidationExtension ,
287286 targetConfig : TargetConfig ,
288287 commonApiDump : TaskProvider <Task >? = null,
@@ -299,18 +298,16 @@ private fun Project.configureCheckTasks(
299298 group = " verification"
300299 description = " Checks signatures of public API against the golden value in API folder for $projectName "
301300 projectApiFile.set(apiCheckDir.get().resolve(jvmDumpFileName))
302- generatedApiFile.set(apiBuildDir.get().resolve(jvmDumpFileName))
303- dependsOn(apiBuild)
301+ generatedApiFile.fileProvider(apiBuild.map { it.outputApiFile })
304302 }
305303
306304 val dumpFileName = project.jvmDumpFileName
307305 val apiDump = task<SyncFile >(targetConfig.apiTaskName(" Dump" )) {
308306 isEnabled = apiCheckEnabled(projectName, extension) && apiBuild.map { it.enabled }.getOrElse(true )
309307 group = " other"
310308 description = " Syncs the API file for $projectName "
311- from.fileProvider(apiBuildDir .map { it.resolve(dumpFileName) })
309+ from.fileProvider(apiBuild .map { it.outputApiFile })
312310 to.fileProvider(apiCheckDir.map { it.resolve(dumpFileName) })
313- dependsOn(apiBuild)
314311 }
315312
316313 commonApiDump?.configure { it.dependsOn(apiDump) }
0 commit comments