Merge pull request #44 from PatilShreyas/v1.0.1

Fix issue due to Moshi dependency in Gradle Plugin

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"
+    const val VERSION = "v1.0.1"
 }

core/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     kotlin("jvm")
+    kotlin("plugin.serialization") version libs.versions.kotlin.get()
     id(libs.plugins.mavenPublish.get().pluginId)
 }
 
@@ -9,5 +10,5 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib"))
-    implementation(libs.moshi)
+    implementation(libs.kotlinx.serialization.json)
 }

core/src/main/kotlin/dev/shreyaspatil/composeCompilerMetricsGenerator/core/ComposeCompilerMetricsProvider.kt

@@ -23,15 +23,15 @@
  */
 package dev.shreyaspatil.composeCompilerMetricsGenerator.core
 
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.adapter
 import dev.shreyaspatil.composeCompilerMetricsGenerator.core.model.DetailedStatistics
 import dev.shreyaspatil.composeCompilerMetricsGenerator.core.model.Item
 import dev.shreyaspatil.composeCompilerMetricsGenerator.core.model.RowItems
 import dev.shreyaspatil.composeCompilerMetricsGenerator.core.model.classes.ClassesReport
 import dev.shreyaspatil.composeCompilerMetricsGenerator.core.model.composables.ComposablesReport
 import dev.shreyaspatil.composeCompilerMetricsGenerator.core.parser.ClassReportParser
 import dev.shreyaspatil.composeCompilerMetricsGenerator.core.parser.ComposableReportParser
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 
 /**
  * Provides metrics and reports of a Compose compiler
@@ -66,12 +66,11 @@ interface ComposeCompilerMetricsProvider {
 private class DefaultComposeCompilerMetricsProvider(
     private val contentProvider: ComposeMetricsContentProvider
 ) : ComposeCompilerMetricsProvider {
-    private val moshi = Moshi.Builder().build()
 
     override fun getOverallStatistics(): Map<String, Long> {
         val statistics = mutableMapOf<String, Long>()
         contentProvider.briefStatisticsContents.forEach { statContent ->
-            val stats = moshi.adapter<Map<String, Long>>().fromJson(statContent) ?: emptyMap()
+            val stats = Json.decodeFromString<Map<String, Long>>(statContent)
             if (statistics.isEmpty()) {
                 statistics.putAll(stats)
             } else {

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 options_list
+    Usage: Compose Compiler Report to HTML Generator ~ v1.0.1 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"
+      id "dev.shreyaspatil.compose-compiler-report-generator" version "1.0.1"
     }
     ```
 
 === "Kotlin"
 
     ```kotlin title="build.gradle.kts"
     plugins {
-      id("dev.shreyaspatil.compose-compiler-report-generator") version "1.0.0"
+      id("dev.shreyaspatil.compose-compiler-report-generator") version "1.0.1"
     }    
     ```
 
@@ -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"
+        classpath "dev.shreyaspatil.compose-compiler-report-generator:gradle-plugin:1.0.1"
       }
     }
     ```
@@ -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")
+        classpath("dev.shreyaspatil.compose-compiler-report-generator:gradle-plugin:1.0.1")
       }
     }
     ```

gradle.properties

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

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 kotlin = "1.8.0"
+serialization = "1.5.0"
 coroutines = "1.6.4"
-moshi = "1.14.0"
 spotless = "6.3.0"
 kotlinxHtml = "0.7.5"
 kotlinxCli = "0.3.5"
@@ -10,7 +10,7 @@ androidGradlePlugin = "7.3.1"
 gradlePluginPublish = "1.1.0"
 
 [libraries]
-moshi = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-html-jvm = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinxHtml" }
 kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli", version.ref = "kotlinxCli" }

package.json

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