Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android flavor management #288

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Android flavor management #288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 18 additions & 10 deletions src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.library.abi.ExperimentalLibraryAbiReader
import org.jetbrains.kotlin.library.abi.LibraryAbiReader
import java.io.*
import java.util.*

Expand Down Expand Up @@ -133,9 +132,9 @@ public class BinaryCompatibilityValidatorPlugin : Plugin<Project> {
val androidExtension = project.extensions
.getByName("kotlin") as KotlinAndroidProjectExtension
androidExtension.target.compilations.matching {
it.compilationName == "release"
it.compilationName.contains("release", ignoreCase = true) && !it.compilationName.contains("test", true)
}.all {
project.configureKotlinCompilation(it, extension, jvmRuntimeClasspath, useOutput = true)
project.configureKotlinCompilation(it, extension, jvmRuntimeClasspath, useOutput = true, dumpFileNameExtension = it.compilationName.replace("release", "", true))
}
}

Expand Down Expand Up @@ -207,13 +206,14 @@ private fun Project.configureKotlinCompilation(
commonApiDump: TaskProvider<Task>? = null,
commonApiCheck: TaskProvider<Task>? = null,
useOutput: Boolean = false,
dumpFileNameExtension: String = "",
) {
val projectName = project.name
val dumpFileName = project.jvmDumpFileName
val dumpFileName = getDumpFileName(dumpFileNameExtension)
val apiDirProvider = targetConfig.apiDir
val apiBuildDir = apiDirProvider.flatMap { f -> layout.buildDirectory.asFile.map { it.resolve(f) } }

val apiBuild = task<KotlinApiBuildTask>(targetConfig.apiTaskName("Build")) {
val apiBuild = task<KotlinApiBuildTask>(targetConfig.apiTaskName("Build${dumpFileNameExtension.capitalize()}")) {
isEnabled = apiCheckEnabled(projectName, extension)
// 'group' is not specified deliberately, so it will be hidden from ./gradlew tasks
description =
Expand All @@ -228,7 +228,14 @@ private fun Project.configureKotlinCompilation(
outputApiFile.fileProvider(apiBuildDir.map { it.resolve(dumpFileName) })
runtimeClasspath.from(jvmRuntimeClasspath)
}
configureCheckTasks(apiBuild, extension, targetConfig, commonApiDump, commonApiCheck)
configureCheckTasks(apiBuild, extension, targetConfig, commonApiDump, commonApiCheck, dumpFileNameExtension)
}

private fun Project.getDumpFileName(dumpFileNameExtension: String): String {
val jvmDumpFileName = project.jvmDumpFileName
val capitalizedIfNeededJvmDumpFileName =
if (dumpFileNameExtension.isEmpty()) jvmDumpFileName else jvmDumpFileName.capitalize()
return "$dumpFileNameExtension$capitalizedIfNeededJvmDumpFileName"
}

internal val Project.sourceSets: SourceSetContainer
Expand Down Expand Up @@ -280,23 +287,24 @@ private fun Project.configureCheckTasks(
targetConfig: TargetConfig,
commonApiDump: TaskProvider<Task>? = null,
commonApiCheck: TaskProvider<Task>? = null,
dumpFileNameExtension: String = "",
) {
val projectName = project.name
val apiCheckDir = targetConfig.apiDir.map {
projectDir.resolve(it).also { r ->
logger.debug("Configuring api for ${targetConfig.targetName ?: "jvm"} to $r")
}
}
val apiCheck = task<KotlinApiCompareTask>(targetConfig.apiTaskName("Check")) {
val dumpFileName = getDumpFileName(dumpFileNameExtension)
val apiCheck = task<KotlinApiCompareTask>(targetConfig.apiTaskName("Check${dumpFileNameExtension.capitalize()}")) {
isEnabled = apiCheckEnabled(projectName, extension) && apiBuild.map { it.enabled }.getOrElse(true)
group = "verification"
description = "Checks signatures of public API against the golden value in API folder for $projectName"
projectApiFile.fileProvider(apiCheckDir.map { it.resolve(jvmDumpFileName) })
projectApiFile.fileProvider(apiCheckDir.map { it.resolve(dumpFileName) })
generatedApiFile.set(apiBuild.flatMap { it.outputApiFile })
}

val dumpFileName = project.jvmDumpFileName
val apiDump = task<SyncFile>(targetConfig.apiTaskName("Dump")) {
val apiDump = task<SyncFile>(targetConfig.apiTaskName("Dump${dumpFileNameExtension.capitalize()}")) {
isEnabled = apiCheckEnabled(projectName, extension) && apiBuild.map { it.enabled }.getOrElse(true)
group = "other"
description = "Syncs the API file for $projectName"
Expand Down