@@ -234,7 +234,7 @@ private fun Project.configureKotlinCompilation(
234
234
}
235
235
outputApiFile = apiBuildDir.get().resolve(dumpFileName)
236
236
}
237
- configureCheckTasks(apiBuildDir, apiBuild, extension, targetConfig, commonApiDump, commonApiCheck)
237
+ configureCheckTasks(apiBuild, extension, targetConfig, commonApiDump, commonApiCheck)
238
238
}
239
239
240
240
internal val Project .sourceSets: SourceSetContainer
@@ -277,12 +277,11 @@ private fun Project.configureApiTasks(
277
277
outputApiFile = apiBuildDir.get().resolve(dumpFileName)
278
278
}
279
279
280
- configureCheckTasks(apiBuildDir, apiBuild, extension, targetConfig)
280
+ configureCheckTasks(apiBuild, extension, targetConfig)
281
281
}
282
282
283
283
private fun Project.configureCheckTasks (
284
- apiBuildDir : Provider <File >,
285
- apiBuild : TaskProvider <* >,
284
+ apiBuild : TaskProvider <KotlinApiBuildTask >,
286
285
extension : ApiValidationExtension ,
287
286
targetConfig : TargetConfig ,
288
287
commonApiDump : TaskProvider <Task >? = null,
@@ -299,18 +298,16 @@ private fun Project.configureCheckTasks(
299
298
group = " verification"
300
299
description = " Checks signatures of public API against the golden value in API folder for $projectName "
301
300
projectApiFile.set(apiCheckDir.get().resolve(jvmDumpFileName))
302
- generatedApiFile.set(apiBuildDir.get().resolve(jvmDumpFileName))
303
- dependsOn(apiBuild)
301
+ generatedApiFile.fileProvider(apiBuild.map { it.outputApiFile })
304
302
}
305
303
306
304
val dumpFileName = project.jvmDumpFileName
307
305
val apiDump = task<SyncFile >(targetConfig.apiTaskName(" Dump" )) {
308
306
isEnabled = apiCheckEnabled(projectName, extension) && apiBuild.map { it.enabled }.getOrElse(true )
309
307
group = " other"
310
308
description = " Syncs the API file for $projectName "
311
- from.fileProvider(apiBuildDir .map { it.resolve(dumpFileName) })
309
+ from.fileProvider(apiBuild .map { it.outputApiFile })
312
310
to.fileProvider(apiCheckDir.map { it.resolve(dumpFileName) })
313
- dependsOn(apiBuild)
314
311
}
315
312
316
313
commonApiDump?.configure { it.dependsOn(apiDump) }
0 commit comments