Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {
}

runner.build().apply {
assertTaskSkipped(":jvmApiDump")
assertTaskUpToDate(":apiDump")
assertTaskSuccess(":jvmApiDump")
assertTaskSuccess(":apiDump")
}
}

Expand All @@ -149,9 +149,28 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {
}

runner.build().apply {
assertTaskSkipped(":jvmApiCheck")
assertTaskUpToDate(":apiCheck")
assertTaskSuccess(":jvmApiCheck")
assertTaskSuccess(":apiCheck")
}
}

@Test
fun testApiCheckFailsForEmptyProjectWithoutDumpFile() {
val runner = test {
buildGradleKts {
resolve("/examples/gradle/base/multiplatformWithSingleJvmTarget.gradle.kts")
}

runner {
arguments.add(":apiCheck")
}
}

runner.buildAndFail().apply {
assertTaskFailure(":jvmApiCheck")
assertThat(output).contains(
"Expected file with API declarations 'api${File.separator}${rootProjectDir.name}.api' does not exist"
)
}
}

Expand Down
6 changes: 1 addition & 5 deletions src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ private fun Project.configureKotlinCompilation(

val apiBuild = task<KotlinApiBuildTask>(targetConfig.apiTaskName("Build")) {
// Do not enable task for empty umbrella modules
isEnabled = apiCheckEnabled(projectName, extension) && compilation.hasAnySources()
isEnabled = apiCheckEnabled(projectName, extension)
// 'group' is not specified deliberately, so it will be hidden from ./gradlew tasks
description =
"Builds Kotlin API for 'main' compilations of $projectName. Complementary task and shouldn't be called manually"
Expand Down Expand Up @@ -631,7 +631,3 @@ private val Project.jvmDumpFileName: String
get() = "$name.api"
private val Project.klibDumpFileName: String
get() = "$name.klib.api"

private fun KotlinCompilation<KotlinCommonOptions>.hasAnySources(): Boolean = allKotlinSourceSets.any {
it.kotlin.srcDirs.any(File::exists)
}