Merge pull request #31 from PatilShreyas/v1.0.0-beta03

Release v1.0.0 beta03

Author: PatilShreyas

cli/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/cli/Main.kt

@@ -185,5 +185,5 @@ fun printHeader(header: String) = println(
 )
 
 object Constants {
-    const val VERSION = "v1.0.0-beta02"
+    const val VERSION = "v1.0.0-beta03"
 }

docs/use/using-cli.md

@@ -56,7 +56,7 @@ Run the command to know the usage of CLI
 !!! success "▶️Output"
 
     ```shell
-    Usage: Compose Compiler Report to HTML Generator ~ v1.0.0-beta02 options_list
+    Usage: Compose Compiler Report to HTML Generator ~ v1.0.0-beta03 options_list
     Options:
         --applicationName, -app -> Application name (To be displayed in the report) (always required) { String }
         --inputDirectory, -i -> Input directory where composable report and metrics are available { String }

docs/use/using-gradle-plugin.md

@@ -19,15 +19,15 @@ Apply the plugin to the module in which _**compose is enabled**_.
 
     ```groovy title="build.gradle"
     plugins {
-      id "dev.shreyaspatil.compose-compiler-report-generator" version "1.0.0-beta02"
+      id "dev.shreyaspatil.compose-compiler-report-generator" version "1.0.0-beta03"
     }
     ```
 
 === "Kotlin"
 
     ```kotlin title="build.gradle.kts"
     plugins {
-      id("dev.shreyaspatil.compose-compiler-report-generator") version "1.0.0-beta02"
+      id("dev.shreyaspatil.compose-compiler-report-generator") version "1.0.0-beta03"
     }    
     ```
 
@@ -45,7 +45,7 @@ Add this to top project level `build.gradle`
         }
       }
       dependencies {
-        classpath "dev.shreyaspatil.compose-compiler-report-generator:gradle-plugin:1.0.0-beta02"
+        classpath "dev.shreyaspatil.compose-compiler-report-generator:gradle-plugin:1.0.0-beta03"
       }
     }
     ```
@@ -66,7 +66,7 @@ Add this to top project level `build.gradle`
         }
       }
       dependencies {
-        classpath("dev.shreyaspatil.compose-compiler-report-generator:gradle-plugin:1.0.0-beta02")
+        classpath("dev.shreyaspatil.compose-compiler-report-generator:gradle-plugin:1.0.0-beta03")
       }
     }
     ```

gradle-plugin/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/plugin/ReportGenPlugin.kt

@@ -27,9 +27,11 @@ import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.variant.AndroidComponentsExtension
 import dev.shreyaspatil.composeCompilerMetricsGenerator.plugin.task.createComposeCompilerReportGenTaskForVariant
 import dev.shreyaspatil.composeCompilerMetricsGenerator.plugin.task.executingComposeCompilerReportGenerationGradleTask
-import dev.shreyaspatil.composeCompilerMetricsGenerator.plugin.utils.kotlinOptions
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
 @Suppress("UnstableApiUsage")
 class ReportGenPlugin : Plugin<Project> {
@@ -53,33 +55,38 @@ class ReportGenPlugin : Plugin<Project> {
             if (isComposeEnabled != true) {
                 error("Jetpack Compose is not found enabled in this module '$name'")
             }
-        }
 
-        // When this method returns true it means gradle task for generating report is executing otherwise
-        // normal compilation task is executing.
-        val isFromReportGenGradleTask = target.executingComposeCompilerReportGenerationGradleTask()
-        if (isFromReportGenGradleTask) {
-            commonExtension?.configureKotlinOptionsForComposeCompilerReport(reportExt)
+            // When this method returns true it means gradle task for generating report is executing otherwise
+            // normal compilation task is executing.
+            val isFromReportGenGradleTask = target.executingComposeCompilerReportGenerationGradleTask()
+            if (isFromReportGenGradleTask) {
+                val kotlinAndroidExt = extensions.getByType<KotlinAndroidProjectExtension>()
+                kotlinAndroidExt.target {
+                    // Exclude for test variants, no use!
+                    compilations.filter { !it.name.endsWith("Test") }.forEach {
+                        it.kotlinOptions {
+                            configureKotlinOptionsForComposeCompilerReport(this@afterEvaluate)
+                        }
+                    }
+                }
+            }
         }
     }
 
-    private fun CommonExtension<*, *, *, *>.configureKotlinOptionsForComposeCompilerReport(
-        reportExtension: ComposeCompilerReportExtension,
-    ) {
-        kotlinOptions {
-            val outputPath = reportExtension.composeRawMetricsOutputDirectory.absolutePath
-            if (reportExtension.enableReport.get()) {
-                freeCompilerArgs += listOf(
-                    "-P",
-                    "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=$outputPath"
-                )
-            }
-            if (reportExtension.enableMetrics.get()) {
-                freeCompilerArgs += listOf(
-                    "-P",
-                    "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=$outputPath"
-                )
-            }
+    private fun KotlinJvmOptions.configureKotlinOptionsForComposeCompilerReport(project: Project) {
+        val reportExtension = project.extensions.getByType<ComposeCompilerReportExtension>()
+        val outputPath = reportExtension.composeRawMetricsOutputDirectory.absolutePath
+        if (reportExtension.enableReport.get()) {
+            freeCompilerArgs += listOf(
+                "-P",
+                "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=$outputPath"
+            )
+        }
+        if (reportExtension.enableMetrics.get()) {
+            freeCompilerArgs += listOf(
+                "-P",
+                "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=$outputPath"
+            )
         }
     }
 }

gradle.properties

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 
 GROUP=dev.shreyaspatil.compose-compiler-report-generator
-VERSION_NAME=1.0.0-beta02
+VERSION_NAME=1.0.0-beta03
 
 # Library configuration
 SONATYPE_HOST=DEFAULT

package.json

@@ -7,7 +7,7 @@
   "main": "index.js",
   "preferGlobal": true,
   "repository": "https://github.com/PatilShreyas/compose-report-to-html",
-  "version": "1.0.0-beta02",
+  "version": "1.0.0-beta03",
   "jdeploy": {
     "jdk": false,
     "javaVersion": "11",