Merge pull request #45 from PatilShreyas/update-deps

PatilShreyas · web-flow · commit 113415bebaf1 · 2023-03-18T16:19:25.000+05:30
Update dependencies and reformat source
diff --git a/cli/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/cli/Main.kt b/cli/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/cli/Main.kt
@@ -50,7 +50,7 @@ fun main(args: Array<String>) {
 
     val html = HtmlReportGenerator(
         reportSpec = reportSpec,
-        metricsProvider = ComposeCompilerMetricsProvider(rawReportProvider)
+        metricsProvider = ComposeCompilerMetricsProvider(rawReportProvider),
     ).generateHtml()
 
     printHeader("Saving Composable Report")
@@ -89,43 +89,43 @@ class CliArguments(args: Array<String>, private val path: Path) {
     val applicationName by parser.option(
         ArgType.String,
         shortName = "app",
-        description = "Application name (To be displayed in the report)"
+        description = "Application name (To be displayed in the report)",
     ).required()
 
     val inputDirectory by parser.option(
         ArgType.String,
         shortName = "i",
-        description = "Input directory where composable report and metrics are available"
+        description = "Input directory where composable report and metrics are available",
     )
 
     val overallStatsFile by parser.option(
         ArgType.String,
         shortName = "overallStatsReport",
-        description = "Overall Statistics Metrics JSON files (separated by commas)"
+        description = "Overall Statistics Metrics JSON files (separated by commas)",
     )
 
     val detailedStatsFile by parser.option(
         ArgType.String,
         shortName = "detailedStatsMetrics",
-        description = "Detailed Statistics Metrics CSV files (separated by commas)"
+        description = "Detailed Statistics Metrics CSV files (separated by commas)",
     )
 
     val composableMetricsFile by parser.option(
         ArgType.String,
         shortName = "composableMetrics",
-        description = "Composable Metrics TXT files (separated by commas)"
+        description = "Composable Metrics TXT files (separated by commas)",
     )
 
     val classMetricsFile by parser.option(
         ArgType.String,
         shortName = "classMetrics",
-        description = "Class Metrics TXT files (separated by commas)"
+        description = "Class Metrics TXT files (separated by commas)",
     )
 
     val outputDirectory by parser.option(
         ArgType.String,
         shortName = "o",
-        description = "Output directory name"
+        description = "Output directory name",
     ).default(path.toAbsolutePath().toString())
 
     init {
@@ -144,7 +144,7 @@ class CliArguments(args: Array<String>, private val path: Path) {
             overallStatsFile,
             detailedStatsFile,
             composableMetricsFile,
-            classMetricsFile
+            classMetricsFile,
         )
 
         return if (directory != null) {
@@ -164,7 +164,7 @@ class CliArguments(args: Array<String>, private val path: Path) {
             briefStatisticsJsonFiles = files(overallStatsFile!!),
             detailedStatisticsCsvFiles = files(detailedStatsFile!!),
             composableReportFiles = files(composableMetricsFile!!),
-            classesReportFiles = files(classMetricsFile!!)
+            classesReportFiles = files(classMetricsFile!!),
         )
     }
 
@@ -181,7 +181,7 @@ fun printHeader(header: String) = println(
     """
     ------------------------------------------------------------------
     $header
-    """.trimIndent()
+    """.trimIndent(),
 )
 
 object Constants {
diff --git a/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/ComposeCompilerMetricsProvider.kt b/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/ComposeCompilerMetricsProvider.kt
@@ -64,7 +64,7 @@ interface ComposeCompilerMetricsProvider {
  */
 @OptIn(ExperimentalStdlibApi::class)
 private class DefaultComposeCompilerMetricsProvider(
-    private val contentProvider: ComposeMetricsContentProvider
+    private val contentProvider: ComposeMetricsContentProvider,
 ) : ComposeCompilerMetricsProvider {
 
     override fun getOverallStatistics(): Map<String, Long> {
@@ -113,7 +113,7 @@ private class DefaultComposeCompilerMetricsProvider(
  * Factory function for creating [ComposeCompilerMetricsProvider].
  */
 fun ComposeCompilerMetricsProvider(
-    files: ComposeCompilerRawReportProvider
+    files: ComposeCompilerRawReportProvider,
 ): ComposeCompilerMetricsProvider {
     val contentProvider = ComposeMetricsContentProvider(files)
     return DefaultComposeCompilerMetricsProvider(contentProvider)
diff --git a/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/exception/ParsingException.kt b/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/exception/ParsingException.kt
@@ -26,5 +26,5 @@ package dev.shreyaspatil.composeCompilerMetricsGenerator.core.exception
 class ParsingException(
     val content: String,
     cause: Throwable,
-    message: String = "Error occurred while parsing the content"
+    message: String = "Error occurred while parsing the content",
 ) : RuntimeException(message, cause)
diff --git a/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/model/composables/ComposablesReport.kt b/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/model/composables/ComposablesReport.kt
@@ -27,7 +27,7 @@ import dev.shreyaspatil.composeCompilerMetricsGenerator.core.exception.ParsingEx
 
 data class ComposablesReport(
     val composables: List<ComposableDetail>,
-    val errors: List<ParsingException>
+    val errors: List<ParsingException>,
 ) {
     private val partitionedComposables by lazy { composables.partition { !it.isSkippable && it.isRestartable } }
 
diff --git a/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/parser/ClassReportParser.kt b/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/parser/ClassReportParser.kt
@@ -91,7 +91,7 @@ object ClassReportParser : Parser<String, ClassesReport> {
             stability = stability,
             runtimeStability = runtimeStability,
             fields = fields,
-            rawContent = RawContent(classBody)
+            rawContent = RawContent(classBody),
         )
     }
 }
diff --git a/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/parser/ComposableReportParser.kt b/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/parser/ComposableReportParser.kt
@@ -93,7 +93,7 @@ object ComposableReportParser : Parser<String, ComposablesReport> {
             isSkippable = isSkippable,
             isInline = isInline,
             params = params,
-            rawContent = RawContent(function)
+            rawContent = RawContent(function),
         )
     }
 }
diff --git a/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/utils/CamelCaseToWord.kt b/core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/utils/CamelCaseToWord.kt
diff --git a/gradle-plugin/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/plugin/ReportGenPlugin.kt b/gradle-plugin/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/plugin/ReportGenPlugin.kt
@@ -79,13 +79,13 @@ class ReportGenPlugin : Plugin<Project> {
         if (reportExtension.enableReport.get()) {
             freeCompilerArgs += listOf(
                 "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=$outputPath"
+                "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=$outputPath",
             )
         }
         if (reportExtension.enableMetrics.get()) {
             freeCompilerArgs += listOf(
                 "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=$outputPath"
+                "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=$outputPath",
             )
         }
     }
diff --git a/gradle-plugin/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/plugin/task/ComposeCompilerReportGenerateTask.kt b/gradle-plugin/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/plugin/task/ComposeCompilerReportGenerateTask.kt
@@ -73,7 +73,7 @@ abstract class ComposeCompilerReportGenerateTask : DefaultTask() {
                         "--rerun-tasks",
 
                         // Signal for enabling report generation in `kotlinOptions{}` block.
-                        "-P$KEY_ENABLE_REPORT_GEN=true"
+                        "-P$KEY_ENABLE_REPORT_GEN=true",
                     )
                     .run()
             }
@@ -86,13 +86,13 @@ abstract class ComposeCompilerReportGenerateTask : DefaultTask() {
         val reportSpec = ReportSpec(reportExtension.name.get())
 
         val rawReportProvider = ComposeCompilerRawReportProvider.FromDirectory(
-            directory = reportExtension.composeRawMetricsOutputDirectory
+            directory = reportExtension.composeRawMetricsOutputDirectory,
         )
 
         // Provide metric files to generator
         val htmlGenerator = HtmlReportGenerator(
             reportSpec = reportSpec,
-            metricsProvider = ComposeCompilerMetricsProvider(rawReportProvider)
+            metricsProvider = ComposeCompilerMetricsProvider(rawReportProvider),
         )
 
         // Generate HTML (as String)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,8 +2,8 @@
 kotlin = "1.8.0"
 serialization = "1.5.0"
 coroutines = "1.6.4"
-spotless = "6.3.0"
-kotlinxHtml = "0.7.5"
+spotless = "6.17.0"
+kotlinxHtml = "0.8.0"
 kotlinxCli = "0.3.5"
 mavenPublish = "0.24.0"
 androidGradlePlugin = "7.3.1"
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/HtmlReportGenerator.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/HtmlReportGenerator.kt
@@ -40,13 +40,12 @@ import kotlinx.html.stream.createHTML
  */
 class HtmlReportGenerator(
     private val reportSpec: ReportSpec,
-    private val metricsProvider: ComposeCompilerMetricsProvider
+    private val metricsProvider: ComposeCompilerMetricsProvider,
 ) {
     /**
      * Returns HTML content as a [String]
      */
     fun generateHtml(): String = runBlocking(Dispatchers.Default) {
-
         val deferredOverallStatistics = async {
             metricsProvider.getOverallStatistics().map { (name, value) -> camelCaseToWord(name) to value }.toMap()
         }
@@ -66,14 +65,14 @@ class HtmlReportGenerator(
         overallStatistics: Map<String, Long>,
         detailedStatistics: DetailedStatistics,
         composablesReport: ComposablesReport,
-        classesReport: ClassesReport
+        classesReport: ClassesReport,
     ) = createHTML().html {
         MainContent(
             reportSpec = reportSpec,
             overallStatistics = overallStatistics,
             detailedStatistics = detailedStatistics,
             composablesReport = composablesReport,
-            classesReport = classesReport
+            classesReport = classesReport,
         )
     }
 }
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/ReportSpec.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/ReportSpec.kt
@@ -29,5 +29,5 @@ package dev.shreyaspatil.composeCompilerMetricsGenerator.generator
  * TODO: See if more specifications needed in future
  */
 data class ReportSpec(
-    val name: String
+    val name: String,
 )
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/ClassReport.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/ClassReport.kt
@@ -57,9 +57,9 @@ fun FlowContent.ClassesReport(report: ClassesReport) {
                         summaryAttr = {
                             setStyle(
                                 backgroundColor = Colors.RED_DARK,
-                                fontSize = "18px"
+                                fontSize = "18px",
                             )
-                        }
+                        },
                     ) {
                         setStyle(backgroundColor = Colors.PINK_LIGHT)
                         ClassesReport(report.unstableClasses)
@@ -74,9 +74,9 @@ fun FlowContent.ClassesReport(report: ClassesReport) {
                         summaryAttr = {
                             setStyle(
                                 backgroundColor = Colors.GREEN_DARK,
-                                fontSize = "18px"
+                                fontSize = "18px",
                             )
-                        }
+                        },
                     ) {
                         setStyle(backgroundColor = Colors.ALABASTER)
                         ClassesReport(report.stableClasses)
@@ -119,7 +119,7 @@ fun FlowContent.ClassesReport(classes: List<ClassDetail>) = table {
                             tr {
                                 setStyle(
                                     backgroundColor = statusColorFrom(field.status),
-                                    color = textColorFrom(field.status)
+                                    color = textColorFrom(field.status),
                                 )
                                 td { +index.toString() }
                                 td { +field.status.uppercase() }
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/ComposableReport.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/ComposableReport.kt
@@ -55,7 +55,7 @@ fun BODY.ComposablesReport(composablesReport: ComposablesReport) {
                     summary = "Composables with issues (Restartable but Not Skippable)",
                     summaryAttr = {
                         setStyle(backgroundColor = Colors.RED_DARK, fontSize = "18px")
-                    }
+                    },
                 ) {
                     setStyle(backgroundColor = Colors.PINK_LIGHT)
                     ComposablesReport(composablesReport.restartableButNotSkippableComposables)
@@ -69,7 +69,7 @@ fun BODY.ComposablesReport(composablesReport: ComposablesReport) {
                     summary = "Composibles without issues",
                     summaryAttr = {
                         setStyle(backgroundColor = Colors.GREEN_DARK, fontSize = "18px")
-                    }
+                    },
                 ) {
                     setStyle(backgroundColor = Colors.ALABASTER)
                     ComposablesReport(composablesReport.nonIssuesComposables)
@@ -125,7 +125,7 @@ fun FlowContent.ComposablesReport(composables: List<ComposableDetail>) = table {
                                     Condition.STABLE -> "background-status-success"
                                     Condition.UNSTABLE -> "background-status-failure"
                                     Condition.MISSING -> "background-status-missing"
-                                }
+                                },
                             ) {
                                 td { +index.toString() }
                                 td { +param.condition.toString() }
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/ErrorReports.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/ErrorReports.kt
@@ -42,23 +42,23 @@ fun FlowContent.ErrorReports(errors: List<ParsingException>) {
             +"These below errors were occurred while generating this report"
             a(
                 href = "https://github.com/PatilShreyas/compose-report-to-html/issues",
-                target = "_blank"
+                target = "_blank",
             ) { +" Please report issues here" }
         }
         errors.forEachIndexedFromOne { index, error ->
             CollapsibleContent(
                 summary = "$index. ${error.message ?: "Unknown error"}",
                 summaryAttr = {
                     setStyle(backgroundColor = Colors.RED_DARK, color = Colors.WHITE, margin = "4px", fontSize = "14px")
-                }
+                },
             ) {
                 p("code") {
                     setStyle(
                         backgroundColor = Colors.PINK_LIGHT,
                         fontSize = "14px",
                         color = Colors.BLACK,
                         textAlign = "left",
-                        padding = "8px"
+                        padding = "8px",
                     )
 
                     error.stackTraceToString().lines().forEach { line ->
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/Footer.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/Footer.kt
@@ -34,7 +34,7 @@ fun BODY.Footer() {
             +"This report is beautified with "
             a(
                 href = "https://github.com/PatilShreyas/compose-report-to-html",
-                target = "_blank"
+                target = "_blank",
             ) { +"Compose Report to HTML" }
         }
     }
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/MainContent.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/MainContent.kt
@@ -42,7 +42,7 @@ fun HTML.MainContent(
     overallStatistics: Map<String, Long>,
     detailedStatistics: DetailedStatistics,
     composablesReport: ComposablesReport,
-    classesReport: ClassesReport
+    classesReport: ClassesReport,
 ) {
     head {
         title("${reportSpec.name} - Compose Compiler Report")
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/common/CollapsibleContent.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/content/common/CollapsibleContent.kt
@@ -32,7 +32,7 @@ import kotlinx.html.impl.DelegatingMap
 fun FlowContent.CollapsibleContent(
     summary: String,
     summaryAttr: DelegatingMap.() -> Unit = {},
-    content: DIV.() -> Unit
+    content: DIV.() -> Unit,
 ) {
     button(classes = "collapsible") {
         attributes.apply(summaryAttr)
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/script/CollapsibleScript.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/script/CollapsibleScript.kt
@@ -49,7 +49,7 @@ fun FlowContent.CollapsibleScript() {
                         } 
                       });
                     }
-                """.trimIndent()
+                """.trimIndent(),
             )
         }
     }
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/style/CssStyle.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/style/CssStyle.kt
@@ -52,7 +52,7 @@ fun HTMLTag.setStyle(
         textAlign = textAlign,
         width = width,
         margin = margin,
-        padding = padding
+        padding = padding,
     )
 }
 
@@ -74,8 +74,8 @@ fun DelegatingMap.setStyle(
             textAlign = textAlign,
             width = width,
             margin = margin,
-            padding = padding
-        )
+            padding = padding,
+        ),
     )
 }
 
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/style/Fonts.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/style/Fonts.kt
@@ -31,6 +31,6 @@ fun HEAD.FontsLinking() {
     link(rel = "preconnect", href = "https://fonts.gstatic.com", type = "crossorigin")
     link(
         rel = "stylesheet",
-        href = "https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap"
+        href = "https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap",
     )
 }
diff --git a/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/style/PageStyle.kt b/report-generator/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/generator/style/PageStyle.kt
@@ -148,7 +148,7 @@ fun HEAD.PageStyle() {
                         font-size: 18px;
                         font-weight: 600;
                     }
-                """.trimIndent()
+                """.trimIndent(),
             )
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ object ClassReportParser : Parser<String, ClassesReport> {`
`91`	`91`	`stability = stability,`
`92`	`92`	`runtimeStability = runtimeStability,`
`93`	`93`	`fields = fields,`
`94`		`- rawContent = RawContent(classBody)`
	`94`	`+ rawContent = RawContent(classBody),`
`95`	`95`	`)`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ object ComposableReportParser : Parser<String, ComposablesReport> {`
`93`	`93`	`isSkippable = isSkippable,`
`94`	`94`	`isInline = isInline,`
`95`	`95`	`params = params,`
`96`		`- rawContent = RawContent(function)`
	`96`	`+ rawContent = RawContent(function),`
`97`	`97`	`)`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,13 @@ class ReportGenPlugin : Plugin<Project> {`
`79`	`79`	`if (reportExtension.enableReport.get()) {`
`80`	`80`	`freeCompilerArgs += listOf(`
`81`	`81`	`"-P",`
`82`		`- "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=$outputPath"`
	`82`	`+ "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=$outputPath",`
`83`	`83`	`)`
`84`	`84`	`}`
`85`	`85`	`if (reportExtension.enableMetrics.get()) {`
`86`	`86`	`freeCompilerArgs += listOf(`
`87`	`87`	`"-P",`
`88`		`- "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=$outputPath"`
	`88`	`+ "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=$outputPath",`
`89`	`89`	`)`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ abstract class ComposeCompilerReportGenerateTask : DefaultTask() {`
`73`	`73`	`"--rerun-tasks",`
`74`	`74`
`75`	`75`	// Signal for enabling report generation in `kotlinOptions{}` block.
`76`		`- "-P$KEY_ENABLE_REPORT_GEN=true"`
	`76`	`+ "-P$KEY_ENABLE_REPORT_GEN=true",`
`77`	`77`	`)`
`78`	`78`	`.run()`
`79`	`79`	`}`
`@@ -86,13 +86,13 @@ abstract class ComposeCompilerReportGenerateTask : DefaultTask() {`
`86`	`86`	`val reportSpec = ReportSpec(reportExtension.name.get())`
`87`	`87`
`88`	`88`	`val rawReportProvider = ComposeCompilerRawReportProvider.FromDirectory(`
`89`		`- directory = reportExtension.composeRawMetricsOutputDirectory`
	`89`	`+ directory = reportExtension.composeRawMetricsOutputDirectory,`
`90`	`90`	`)`
`91`	`91`
`92`	`92`	`// Provide metric files to generator`
`93`	`93`	`val htmlGenerator = HtmlReportGenerator(`
`94`	`94`	`reportSpec = reportSpec,`
`95`		`- metricsProvider = ComposeCompilerMetricsProvider(rawReportProvider)`
	`95`	`+ metricsProvider = ComposeCompilerMetricsProvider(rawReportProvider),`
`96`	`96`	`)`
`97`	`97`
`98`	`98`	`// Generate HTML (as String)`