revert rename appSizeAnalysis* task to aabSizeAnalysis*

grab · Feb 5, 2025 · aa20896 · aa20896
1 parent 4782652
commit aa20896
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,4 +64,4 @@ jobs:
             - name: Build sample app
               run: |
                   cd ./sample
-                  ./gradlew app:aabSizeAnalysisProRelease --stacktrace -Dorg.gradle.debug=false --no-daemon
+                  ./gradlew app:appSizeAnalysisProRelease --stacktrace -Dorg.gradle.debug=false --no-daemon
diff --git a/sample/app/build.gradle b/sample/app/build.gradle
@@ -104,7 +104,7 @@ apply plugin: "com.grab.sizer"
 appSizer {
     enabled = true
     projectInput {
-        aab {
+        apk {
             bundleToolFile = file("${rootProject.rootDir}/binary/bundletool-all-1.15.4.jar")
             deviceSpecs = [
                     file("${rootProject.rootDir}/app-size-config/device-1.json"),

diff --git a/sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/TaskManager.kt b/sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/TaskManager.kt
@@ -118,16 +118,16 @@ internal class TaskManager(
             variant
         )
 
-        val aabSizeAnalysisTask = AppSizeAnalysisTask.registerTask(
-            name = "aab",
+        val appSizeAnalysisTask = AppSizeAnalysisTask.registerTask(
+            name = "app",
             project = project,
             variant = variant,
             pluginExtension = pluginExtension,
             apkDirectories = generateApkFromAabTask.map { it.outputDirectories },
             generateArchivesListTask = generateArchivesListTask,
         )
 
-        return aabSizeAnalysisTask
+        return appSizeAnalysisTask
     }
 
     private fun registerAppSizeTaskDep(

diff --git a/...er/configuration/AabGeneratorExtension.kt → ...er/configuration/ApkGeneratorExtension.kt b/...er/configuration/AabGeneratorExtension.kt → ...er/configuration/ApkGeneratorExtension.kt
@@ -33,7 +33,7 @@ import org.gradle.api.provider.ListProperty
 import java.io.File
 import javax.inject.Inject
 
-open class AabGeneratorExtension @Inject constructor(objects: ObjectFactory) {
+open class ApkGeneratorExtension @Inject constructor(objects: ObjectFactory) {
     val bundleToolFile: RegularFileProperty = objects.fileProperty()
     val deviceSpecs: ListProperty<File> = objects.listProperty(File::class.java)
 }

diff --git a/sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/configuration/InputExtension.kt b/sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/configuration/InputExtension.kt
@@ -38,7 +38,7 @@ import javax.inject.Inject
 private const val DEFAULT_LARGE_FILE = 10240L // 10kb
 
 open class InputExtension @Inject constructor(objects: ObjectFactory) {
-    val aab: AabGeneratorExtension = objects.newInstance(AabGeneratorExtension::class.java, objects)
+    val apk: ApkGeneratorExtension = objects.newInstance(ApkGeneratorExtension::class.java, objects)
     val teamMappingFile: RegularFileProperty = objects.fileProperty()
     var variantFilter: Action<VariantFilter>? = null
     var largeFileThreshold: Long = DEFAULT_LARGE_FILE
@@ -48,20 +48,15 @@ open class InputExtension @Inject constructor(objects: ObjectFactory) {
         variantFilter = action
     }
 
-    fun aab(action: Action<in AabGeneratorExtension>) {
-        action.execute(aab)
+    fun apk(action: Action<in ApkGeneratorExtension>) {
+        action.execute(apk)
     }
 
-    fun aab(block: AabGeneratorExtension.() -> Unit) {
-        block(aab)
+    fun apk(block: ApkGeneratorExtension.() -> Unit) {
+        block(apk)
     }
 }
 
-enum class InputType {
-    AAB,
-    APK
-}
-
 interface VariantFilter {
     fun setIgnore(ignore: Boolean)
     val buildType: BuildType

diff --git a/sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/tasks/GenerateApkTask.kt b/sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/tasks/GenerateApkTask.kt
@@ -192,8 +192,8 @@ internal abstract class GenerateApkTask : DefaultTask() {
         ): TaskProvider<GenerateApkTask> {
             val bundleTask = project.tasks.named("sign${variant.name.capitalize()}Bundle")
             val task = project.tasks.register("generateApk${variant.name.capitalize()}", GenerateApkTask::class.java) {
-                deviceSpecFiles.setFrom(extension.input.aab.deviceSpecs)
-                bundleToolFile.set(extension.input.aab.bundleToolFile)
+                deviceSpecFiles.setFrom(extension.input.apk.deviceSpecs)
+                bundleToolFile.set(extension.input.apk.bundleToolFile)
                 appBundleFile.set(
                     bundleTask.map {
                         (it as FinalizeBundleTask).finalBundleFile.get()