refactor: rename AndroidModule.selectedVariant to 'configuredVariant'

This commit is contained in:
Akash Yadav
2023-08-30 11:46:06 +05:30
parent 947248b298
commit ee6aa11bb0
7 changed files with 18 additions and 18 deletions
@@ -505,7 +505,7 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
val variantNames = ImmutableList.builder<String>()
.addAll(subproject.variants.map { variant -> variant.name }).build()
val variantName = subproject.selectedVariant?.name
val variantName = subproject.configuredVariant?.name
?: IAndroidProject.DEFAULT_VARIANT
buildVariants[subproject.path] =
@@ -103,7 +103,7 @@ open class AndroidModule( // Class must be open because BaseXMLTest mocks this..
val lintCheckJars: List<File>,
val modelSyncFiles: List<DefaultModelSyncFile>,
val variants: List<BasicAndroidVariantMetadata> = listOf(),
val selectedVariant: BasicAndroidVariantMetadata?,
val configuredVariant: BasicAndroidVariantMetadata?,
val classesJar: File?
) :
ModuleProject(
@@ -87,7 +87,7 @@ class ProjectTransformer {
val metadata = project.getMetadata().get() as AndroidProjectMetadata
val libraryMap = project.getLibraryMap().get()
val variants = project.getVariants().get()
val selectedVariant = project.getSelectedVariant().get()
val configuredVariant = project.getConfiguredVariant().get()
return AndroidModule(
name = metadata.name ?: IProject.PROJECT_UNKNOWN,
description = metadata.description ?: "",
@@ -112,7 +112,7 @@ class ProjectTransformer {
lintCheckJars = project.getLintCheckJars().get(),
modelSyncFiles = project.getModelSyncFiles().get(),
variants = variants,
selectedVariant = variants.find { it.name == selectedVariant },
configuredVariant = variants.find { it.name == configuredVariant },
classesJar = metadata.classesJar
)
}
@@ -52,7 +52,7 @@ import java.util.concurrent.CompletableFuture
*/
internal class AndroidProjectImpl(
gradleProject: GradleProject,
private val selectedVariant: String,
private val configuredVariant: String,
private val basicAndroidProject: BasicAndroidProject,
private val androidProject: AndroidProject,
private val variantDependencies: VariantDependencies,
@@ -71,8 +71,8 @@ internal class AndroidProjectImpl(
return field
}
override fun getSelectedVariant(): CompletableFuture<String> {
return CompletableFuture.completedFuture(this.selectedVariant)
override fun getConfiguredVariant(): CompletableFuture<String> {
return CompletableFuture.completedFuture(this.configuredVariant)
}
override fun getVariants(): CompletableFuture<List<BasicAndroidVariantMetadata>> {
@@ -172,14 +172,14 @@ internal class AndroidProjectImpl(
private fun getClassesJar(): File {
// TODO(itsaky): this should handle product flavors as well
return File(gradleProject.buildDirectory,
"${IAndroidProject.FD_INTERMEDIATES}/compile_library_classes_jar/$selectedVariant/classes.jar")
"${IAndroidProject.FD_INTERMEDIATES}/compile_library_classes_jar/$configuredVariant/classes.jar")
}
override fun getClasspaths(): CompletableFuture<List<File>> {
return CompletableFuture.supplyAsync {
mutableListOf<File>().apply {
add(getClassesJar())
getVariant(StringParameter(selectedVariant)).get()?.mainArtifact?.classJars?.let(
getVariant(StringParameter(configuredVariant)).get()?.mainArtifact?.classJars?.let(
this::addAll)
}
}
@@ -57,8 +57,8 @@ internal class ForwardingProject(var project: IGradleProject? = null) : IGradleP
UnsupportedOperationException())
}
override fun getSelectedVariant(): CompletableFuture<String> {
return this.androidProject?.getSelectedVariant() ?: CompletableFuture.failedFuture(
override fun getConfiguredVariant(): CompletableFuture<String> {
return this.androidProject?.getConfiguredVariant() ?: CompletableFuture.failedFuture(
UnsupportedOperationException()
)
}
@@ -51,23 +51,23 @@ class AndroidProjectModelBuilder(initializationParams: InitializeProjectParams)
androidVariant = null
}
val selectedVariant = androidVariant ?: variantNames.firstOrNull()
if (selectedVariant.isNullOrBlank()) {
val configurationVariant = androidVariant ?: variantNames.firstOrNull()
if (configurationVariant.isNullOrBlank()) {
throw ModelBuilderException(
"No variant found for project '$projectPath'. providedVariant=$androidVariant")
}
log("Selected build variant '$selectedVariant' for project '$projectPath'")
log("Selected build variant '$configurationVariant' for project '$projectPath'")
val variantDependencies = controller.getModelAndLog(module, VariantDependencies::class.java,
ModelBuilderParameter::class.java) {
it.variantName = selectedVariant
it.variantName = configurationVariant
it.dontBuildRuntimeClasspath = false
}
return AndroidProjectImpl(
module.gradleProject,
selectedVariant,
configurationVariant,
basicModel,
androidModel,
variantDependencies,
@@ -37,10 +37,10 @@ import java.util.concurrent.CompletableFuture
interface IAndroidProject : IModuleProject {
/**
* Get the variant that was selected while building the model for this project.
* Get the variant that was configured/selected while building the model for this project.
*/
@JsonRequest
fun getSelectedVariant(): CompletableFuture<String>
fun getConfiguredVariant(): CompletableFuture<String>
/**
* Get the metadata about all variants of this Android project.