From 01dce6b2f50f8d916031c09b71db08039447c943 Mon Sep 17 00:00:00 2001 From: artus9033 Date: Mon, 8 Dec 2025 11:14:05 +0100 Subject: [PATCH] refactor: rename upperCaseVariantName to more descriptive capitalizedVariantName --- .../brownfield/processors/JNILibsProcessor.kt | 4 ++-- .../brownfield/processors/ProguardProcessor.kt | 6 +++--- .../react/brownfield/processors/VariantHelper.kt | 4 ++-- .../brownfield/processors/VariantProcessor.kt | 14 +++++++------- .../brownfield/processors/VariantTaskProvider.kt | 14 +++++++------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/JNILibsProcessor.kt b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/JNILibsProcessor.kt index 9da6057f..6a30affe 100644 --- a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/JNILibsProcessor.kt +++ b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/JNILibsProcessor.kt @@ -28,8 +28,8 @@ class JNILibsProcessor : BaseProject() { explodeTasks: MutableList, variant: LibraryVariant, ) { - val upperCaseVariantName = variant.name.replaceFirstChar(Char::titlecase) - val taskName = "merge${upperCaseVariantName}JniLibFolders" + val capitalizedVariantName = variant.name.replaceFirstChar(Char::titlecase) + val taskName = "merge${capitalizedVariantName}JniLibFolders" val mergeJniLibsTask = project.tasks.named(taskName) if (!mergeJniLibsTask.isPresent) { diff --git a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/ProguardProcessor.kt b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/ProguardProcessor.kt index 4f72ef24..4c326f72 100644 --- a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/ProguardProcessor.kt +++ b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/ProguardProcessor.kt @@ -22,13 +22,13 @@ import org.gradle.api.tasks.TaskProvider import java.io.File class ProguardProcessor(variant: LibraryVariant) : BaseProject() { - private val upperCaseVariantName = variant.name.replaceFirstChar(Char::titlecase) + private val capitalizedVariantName = variant.name.replaceFirstChar(Char::titlecase) fun processConsumerFiles( aarLibs: Collection, explodeTasks: MutableList, ) { - val mergeTaskName = "merge${upperCaseVariantName}ConsumerProguardFiles" + val mergeTaskName = "merge${capitalizedVariantName}ConsumerProguardFiles" val mergeFileTask = project.tasks.named(mergeTaskName) if (!mergeFileTask.isPresent) { @@ -50,7 +50,7 @@ class ProguardProcessor(variant: LibraryVariant) : BaseProject() { explodeTasks: MutableList, ) { val mergeGenerateProguardTask: TaskProvider<*>? - val mergeName = "merge${upperCaseVariantName}GeneratedProguardFiles" + val mergeName = "merge${capitalizedVariantName}GeneratedProguardFiles" mergeGenerateProguardTask = project.tasks.named(mergeName) mergeGenerateProguardTask?.configure { task -> diff --git a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantHelper.kt b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantHelper.kt index 80dde496..7a0bfdf7 100644 --- a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantHelper.kt +++ b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantHelper.kt @@ -28,7 +28,7 @@ import java.nio.file.Path import java.nio.file.Paths class VariantHelper(private val variant: LibraryVariant) : BaseProject() { - private val upperCaseVariantName = variant.name.replaceFirstChar(Char::titlecase) + private val capitalizedVariantName = variant.name.replaceFirstChar(Char::titlecase) fun getVariant(): LibraryVariant { return variant @@ -117,7 +117,7 @@ class VariantHelper(private val variant: LibraryVariant) : BaseProject() { aarLibraries: Collection, explodeTasks: MutableList, ) { - val taskPath = "generate${upperCaseVariantName}Resources" + val taskPath = "generate${capitalizedVariantName}Resources" val resourceGenTask = project.tasks.named(taskPath) if (!resourceGenTask.isPresent) { diff --git a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantProcessor.kt b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantProcessor.kt index 2dbf859c..704887e0 100644 --- a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantProcessor.kt +++ b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantProcessor.kt @@ -26,7 +26,7 @@ import org.gradle.api.tasks.TaskProvider import java.io.File class VariantProcessor(private val variant: LibraryVariant) : BaseProject() { - private val upperCaseVariantName = variant.name.replaceFirstChar(Char::titlecase) + private val capitalizedVariantName = variant.name.replaceFirstChar(Char::titlecase) private val variantHelper = VariantHelper(variant) private val variantTaskProvider = VariantTaskProvider(variantHelper) private val jniLibsProcessor = JNILibsProcessor() @@ -48,14 +48,14 @@ class VariantProcessor(private val variant: LibraryVariant) : BaseProject() { fun processVariant(artifacts: Collection) { setup() - val preBuildTaskPath = "pre${upperCaseVariantName}Build" + val preBuildTaskPath = "pre${capitalizedVariantName}Build" val prepareTask = project.tasks.named(preBuildTaskPath) if (!prepareTask.isPresent) { throw TaskNotFound("Can not find $preBuildTaskPath task") } - if (upperCaseVariantName == "Release") { + if (capitalizedVariantName == "Release") { prepareTask.dependsOn(":app:createBundleReleaseJsAndAssets") } @@ -77,7 +77,7 @@ class VariantProcessor(private val variant: LibraryVariant) : BaseProject() { private fun mergeClassesAndJars(bundleTask: TaskProvider) { val syncLibTask = project.tasks.named(variantHelper.getSyncLibJarsTaskPath()) - val extractAnnotationsTask = project.tasks.named("extract${upperCaseVariantName}Annotations") + val extractAnnotationsTask = project.tasks.named("extract${capitalizedVariantName}Annotations") mergeClassTask = variantTaskProvider.classesMergeTask(aarLibraries, jarFiles, explodeTasks) syncLibTask.configure { @@ -88,7 +88,7 @@ class VariantProcessor(private val variant: LibraryVariant) : BaseProject() { it.inputs.files(jarFiles).withPathSensitivity(PathSensitivity.RELATIVE) } - project.tasks.named("transform${upperCaseVariantName}ClassesWithAsm").configure { + project.tasks.named("transform${capitalizedVariantName}ClassesWithAsm").configure { it.dependsOn(mergeClassTask) } extractAnnotationsTask.configure { @@ -97,7 +97,7 @@ class VariantProcessor(private val variant: LibraryVariant) : BaseProject() { if (!variant.buildType.isMinifyEnabled) { val mergeJars = variantTaskProvider.jarMergeTask(syncLibTask, aarLibraries, jarFiles, explodeTasks) - project.tasks.named("bundle${upperCaseVariantName}LocalLintAar").configure { + project.tasks.named("bundle${capitalizedVariantName}LocalLintAar").configure { it.dependsOn(mergeJars) } bundleTask.configure { @@ -155,7 +155,7 @@ class VariantProcessor(private val variant: LibraryVariant) : BaseProject() { ): Copy { val group = artifact.moduleVersion.id.group.replaceFirstChar(Char::titlecase) val name = artifact.name.replaceFirstChar(Char::titlecase) - val taskName = "explode$group$name$upperCaseVariantName" + val taskName = "explode$group$name$capitalizedVariantName" val explodeTask = project.tasks.create(taskName, Copy::class.java) { it.from(project.zipTree(artifact.file.absolutePath)) diff --git a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantTaskProvider.kt b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantTaskProvider.kt index 3b3158b7..891de00f 100644 --- a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantTaskProvider.kt +++ b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantTaskProvider.kt @@ -15,15 +15,15 @@ import java.io.File class VariantTaskProvider(private val variantHelper: VariantHelper) : BaseProject() { private val variant = variantHelper.getVariant() - private val upperCaseVariantName = variant.name.replaceFirstChar(Char::titlecase) + private val capitalizedVariantName = variant.name.replaceFirstChar(Char::titlecase) fun classesMergeTask( aarLibraries: Collection, jarFiles: MutableList, explodeTasks: MutableList, ): TaskProvider { - val mergeClassesTaskName = "mergeClasses$upperCaseVariantName" - val kotlinCompileTaskName = "compile${upperCaseVariantName}Kotlin" + val mergeClassesTaskName = "mergeClasses$capitalizedVariantName" + val kotlinCompileTaskName = "compile${capitalizedVariantName}Kotlin" return project.tasks.register(mergeClassesTaskName) { it.outputs.upToDateWhen { false } @@ -54,7 +54,7 @@ class VariantTaskProvider(private val variantHelper: VariantHelper) : BaseProjec jarFiles: MutableList, explodeTasks: MutableList, ): TaskProvider { - return project.tasks.register("mergeJars$upperCaseVariantName") { + return project.tasks.register("mergeJars$capitalizedVariantName") { it.dependsOn(explodeTasks) it.dependsOn(variantHelper.getJavaCompileTask()) it.mustRunAfter(syncLibTask) @@ -92,14 +92,14 @@ class VariantTaskProvider(private val variantHelper: VariantHelper) : BaseProjec val processManifestTask = variantHelper.getProcessManifest() val manifestOutput = project.file( - "$buildDir/intermediates/merged_manifest/${variant.name}/process${upperCaseVariantName}Manifest/AndroidManifest.xml", + "$buildDir/intermediates/merged_manifest/${variant.name}/process${capitalizedVariantName}Manifest/AndroidManifest.xml", ) val inputManifests = aarLibraries.map { it.getManifestFile() } val manifestsMergeTask = project.tasks.register( - "merge${upperCaseVariantName}Manifest", + "merge${capitalizedVariantName}Manifest", ManifestMerger::class.java, ) { it.setGradleVersion(project.gradle.gradleVersion) @@ -148,7 +148,7 @@ class VariantTaskProvider(private val variantHelper: VariantHelper) : BaseProjec } fun processDeepLinkTasks(explodeTasks: MutableList) { - val taskName = "extractDeepLinksForAar$upperCaseVariantName" + val taskName = "extractDeepLinksForAar$capitalizedVariantName" val extractDeepLinks = project.tasks.named(taskName) if (!extractDeepLinks.isPresent) {