add input type setting to support running analysis with apk files

Author: 0xera

sample/app/build.gradle

@@ -104,7 +104,7 @@ apply plugin: "com.grab.sizer"
 appSizer {
     enabled = true
     projectInput {
-        apk {
+        aab {
             bundleToolFile = file("${rootProject.rootDir}/binary/bundletool-all-1.15.4.jar")
             deviceSpecs = [
                     file("${rootProject.rootDir}/app-size-config/device-1.json"),
@@ -116,6 +116,7 @@ appSizer {
         }
         enableMatchDebugVariant = true
         largeFileThreshold = 10
+//        inputType = InputType.APK
         teamMappingFile = file("${rootProject.rootDir}/module-owner.yml")
     }
     metrics {

sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/TaskManager.kt

@@ -33,6 +33,7 @@ import com.android.build.gradle.internal.dsl.BuildType
 import com.android.build.gradle.internal.dsl.ProductFlavor
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 import com.grab.plugin.sizer.configuration.DefaultVariantFilter
+import com.grab.plugin.sizer.configuration.InputType
 import com.grab.plugin.sizer.dependencies.*
 import com.grab.plugin.sizer.tasks.AppSizeAnalysisTask
 import com.grab.plugin.sizer.tasks.GenerateApkTask
@@ -44,7 +45,9 @@ import com.grab.plugin.sizer.utils.isKotlinJvm
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.ProjectDependency
+import org.gradle.api.file.Directory
 import org.gradle.api.tasks.TaskProvider
+import org.gradle.kotlin.dsl.listProperty
 import org.gradle.kotlin.dsl.the
 
 /*
@@ -71,11 +74,23 @@ internal class TaskManager(
                 val variantFilter = DefaultVariantFilter(variant)
                 pluginExtension.input.variantFilter?.execute(variantFilter)
                 if (!variantFilter.ignored) {
-                    val generateApkTask = GenerateApkTask.registerTask(
-                        project,
-                        pluginExtension,
-                        variant
-                    )
+
+                    val apksDirectory = when (pluginExtension.input.inputType) {
+                        InputType.APK -> {
+                            variant.packageApplicationProvider.map {
+                                project.objects.listProperty<Directory>().value(listOf(it.outputDirectory.get()))
+                            }
+                        }
+                        InputType.AAB -> {
+                            val generateApkTask = GenerateApkTask.registerTask(
+                                project,
+                                pluginExtension,
+                                variant
+                            )
+                            generateApkTask.map { it.outputDirectories }
+                        }
+                    }
+
 
                     val generateArchivesListTask = GenerateArchivesListTask.registerTask(
                         project,
@@ -89,7 +104,7 @@ internal class TaskManager(
                         project,
                         variant,
                         pluginExtension,
-                        generateApkTask,
+                        apksDirectory,
                         generateArchivesListTask,
                     )
                     registerAppSizeTaskDep(project, variant, this, appSizeAnalysisTask)

…r/configuration/ApkGeneratorExtension.kt …r/configuration/AabGeneratorExtension.ktsizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/configuration/ApkGeneratorExtension.kt renamed to sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/configuration/AabGeneratorExtension.kt sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/configuration/ApkGeneratorExtension.kt renamed to sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/configuration/AabGeneratorExtension.kt

@@ -27,14 +27,13 @@
 
 package com.grab.plugin.sizer.configuration
 
-import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
 import java.io.File
 import javax.inject.Inject
 
-open class ApkGeneratorExtension @Inject constructor(objects: ObjectFactory) {
+open class AabGeneratorExtension @Inject constructor(objects: ObjectFactory) {
     val bundleToolFile: RegularFileProperty = objects.fileProperty()
     val deviceSpecs: ListProperty<File> = objects.listProperty(File::class.java)
 }

sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/configuration/InputExtension.kt

@@ -38,26 +38,31 @@ import javax.inject.Inject
 private const val DEFAULT_LARGE_FILE = 10240L // 10kb
 
 open class InputExtension @Inject constructor(objects: ObjectFactory) {
-    val apk: ApkGeneratorExtension = objects.newInstance(ApkGeneratorExtension::class.java, objects)
+    val aab: AabGeneratorExtension = objects.newInstance(AabGeneratorExtension::class.java, objects)
     val teamMappingFile: RegularFileProperty = objects.fileProperty()
     var variantFilter: Action<VariantFilter>? = null
     var largeFileThreshold: Long = DEFAULT_LARGE_FILE
     var enableMatchDebugVariant = false
-
+    var inputType: InputType = InputType.AAB
 
     fun variantFilter(action: Action<VariantFilter>) {
         variantFilter = action
     }
 
-    fun apk(action: Action<in ApkGeneratorExtension>) {
-        action.execute(apk)
+    fun aab(action: Action<in AabGeneratorExtension>) {
+        action.execute(aab)
     }
 
-    fun apk(block: ApkGeneratorExtension.() -> Unit) {
-        block(apk)
+    fun aab(block: AabGeneratorExtension.() -> Unit) {
+        block(aab)
     }
 }
 
+enum class InputType {
+    AAB,
+    APK
+}
+
 interface VariantFilter {
     fun setIgnore(ignore: Boolean)
     val buildType: BuildType

sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/tasks/AppSizeAnalysisTask.kt

@@ -48,10 +48,13 @@ import com.grab.sizer.report.db.InfluxDBConfig
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.Directory
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import java.io.File
 
@@ -160,14 +163,14 @@ internal abstract class AppSizeAnalysisTask : DefaultTask() {
             project: Project,
             variant: BaseVariant,
             pluginExtension: AppSizePluginExtension,
-            generateApkTask: TaskProvider<GenerateApkTask>,
+            apkDirectories: Provider<ListProperty<Directory>>,
             generateArchivesListTask: TaskProvider<GenerateArchivesListTask>,
         ): TaskProvider<AppSizeAnalysisTask> {
             return project.tasks.register(
                 "appSizeAnalysis${variant.name.capitalize()}", AppSizeAnalysisTask::class.java
             ) {
                 this.variantInput.set(variant.toVariantInput())
-                this.apkDirectories.setFrom(generateApkTask.map { it.outputDirectories })
+                this.apkDirectories.setFrom(apkDirectories)
                 this.archiveDepJsonFile.set(generateArchivesListTask.map { it.archiveDepFile.get() })
                 this.libName.set(project.params().libraryName())
                 this.option.set(project.params().option())

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.apk.deviceSpecs)
-                bundleToolFile.set(extension.input.apk.bundleToolFile)
+                deviceSpecFiles.setFrom(extension.input.aab.deviceSpecs)
+                bundleToolFile.set(extension.input.aab.bundleToolFile)
                 appBundleFile.set(
                     bundleTask.map {
                         (it as FinalizeBundleTask).finalBundleFile.get()

sizer-gradle-plugin/src/main/kotlin/com/grab/plugin/sizer/utils/PluginInputProvider.kt

@@ -34,6 +34,7 @@ import java.io.File
 
 private const val EXT_AAR = "aar"
 private const val EXT_JAR = "jar"
+private const val EXT_APK = "apk"
 
 class PluginInputProvider(
     private val archiveDependencyStore: ArchiveDependencyStore,
@@ -79,7 +80,8 @@ class PluginInputProvider(
         .filter { it.file.extension.equals(EXT_AAR, true) }
 
     override fun provideApkFiles(): Sequence<File> {
-        return apksDirectory.listFiles()?.asSequence() ?: emptySequence()
+        return apksDirectory.listFiles()?.asSequence()?.filter { it.extension.equals(EXT_APK, true) }
+            ?: emptySequence()
     }
 
     override fun provideR8MappingFile(): File? = r8MappingFile