Merge pull request #821 from mikepenz/release/10.5.2

dev -> main

README.md

@@ -39,7 +39,7 @@
 
 ## Latest releases 🛠
 
-- (Next Gen) Kotlin && Multiplatform && Plugin | [v10.5.1](https://github.com/mikepenz/AboutLibraries/tree/v10.5.1)
+- (Next Gen) Kotlin && Multiplatform && Plugin | [v10.5.2](https://github.com/mikepenz/AboutLibraries/tree/v10.5.2)
 - Kotlin && Gradle Plugin | [v8.9.4](https://github.com/mikepenz/AboutLibraries/tree/v8.9.4)
 
 ## Gradle Plugin
@@ -131,6 +131,8 @@ aboutLibraries {
     duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.LINK
     // Configure the duplication rule, to match "duplicates" with
     duplicationRule = com.mikepenz.aboutlibraries.plugin.DuplicateRule.SIMPLE
+    // Enable pretty printing for the generated JSON file
+    prettyPrint = false
 }
 ```
 

aboutlibraries-compose/src/androidMain/kotlin/com/mikepenz/aboutlibraries/ui/compose/Libraries.kt

@@ -155,7 +155,11 @@ fun LicenseDialog(
 }
 
 @Composable
-fun HtmlText(html: String, modifier: Modifier = Modifier, color: Color = Color.Black) {
+fun HtmlText(
+    html: String,
+    modifier: Modifier = Modifier,
+    color: Color = LibraryDefaults.libraryColors().contentColor
+) {
     AndroidView(modifier = modifier, factory = { context ->
         TextView(context).apply {
             setTextColor(color.toArgb())

app-desktop/build.gradle.kts

@@ -37,4 +37,5 @@ application {
 
 aboutLibraries {
     registerAndroidTasks = false
+    prettyPrint = true
 }

app/build.gradle

@@ -112,6 +112,8 @@ aboutLibraries {
     duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.LINK
     // Configure the duplication rule, to match "duplicates" with
     duplicationRule = com.mikepenz.aboutlibraries.plugin.DuplicateRule.SIMPLE
+    // Enable pretty printing for the generated JSON file
+    prettyPrint = true
 }
 
 dependencies {

gradle.properties

@@ -1,6 +1,6 @@
 GROUP=com.mikepenz
-VERSION_NAME=10.5.1
-VERSION_CODE=100501
+VERSION_NAME=10.5.2
+VERSION_CODE=100502
 
 POM_URL=https://github.com/mikepenz/AboutLibraries
 POM_SCM_URL=https://github.com/mikepenz/AboutLibraries

gradle/libs.versions.toml

@@ -5,29 +5,29 @@ coreMinSdk = "19"
 minSdk = "21"
 targetSdk = "33"
 # build
-gradleBuild = "7.3.0"
+gradleBuild = "7.3.1"
 buildTools = "33.0.0"
 # kotlin
 dokka = "1.7.20"
 kotlinCore = { require = "1.7.20" }
 kotlinCoroutines = { require = "1.6.4" }
 kotlinxSerialization = "1.4.0"
 # compose
-compose = "1.2.1"
+compose = "1.3.1"
 composeCompiler = "1.3.2"
-composejb = "1.2.0"
+composejb = "1.3.0-beta03"
 # androidx
-activity = "1.6.0"
+activity = "1.6.1"
 cardview = "1.0.0"
 constraintLayout = "2.1.4"
 core = "1.9.0"
 lifecycle = { require = "2.5.1" }
 navigation = "2.5.2"
 recyclerView = "1.2.1"
 # google
-material = "1.6.1"
+material = "1.7.0"
 # other
-accompanist = "0.25.1"
+accompanist = "0.27.1"
 fastAdapter = "5.7.0"
 gradleMvnPublish = "0.18.0"
 iconics = "5.3.3"

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExtension.kt

@@ -216,6 +216,17 @@ abstract class AboutLibrariesExtension {
      * ```
      */
     var excludeFields: Array<String> = emptyArray()
+
+    /**
+     * Enable pretty printing for the generated JSON metadata.
+     *
+     * ```
+     * aboutLibraries {
+     *   prettyPrint = true
+     * }
+     * ```
+     */
+    var prettyPrint: Boolean = false
 }
 
 enum class StrictMode {

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesTask.kt

@@ -77,7 +77,7 @@ abstract class AboutLibrariesTask : BaseAboutLibrariesTask() {
         }
 
         // write to disk
-        result.writeToDisk(combinedLibrariesOutputFile, excludeFields)
+        result.writeToDisk(combinedLibrariesOutputFile, excludeFields, extension.prettyPrint)
     }
 
     companion object {

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/model/ResultContainer.kt

@@ -3,6 +3,7 @@ package com.mikepenz.aboutlibraries.plugin.model
 import com.mikepenz.aboutlibraries.plugin.mapping.Library
 import com.mikepenz.aboutlibraries.plugin.mapping.License
 import groovy.json.JsonGenerator
+import groovy.json.JsonOutput
 import java.io.File
 import java.io.OutputStreamWriter
 import java.io.PrintWriter
@@ -13,23 +14,23 @@ import java.util.*
 
 data class ResultContainer(
     val libraries: List<Library>,
-    val licenses: Map<String, License>
+    val licenses: Map<String, License>,
 ) {
     val metadata: MetaData = MetaData()
 }
 
 class MetaData(
     val generated: String = DateTimeFormatter.ISO_DATE_TIME
         .withZone(ZoneOffset.UTC)
-        .format(Calendar.getInstance().toInstant())
+        .format(Calendar.getInstance().toInstant()),
 )
 
-fun ResultContainer.writeToDisk(outputFile: File, excludeFields: Array<String>) {
+fun ResultContainer.writeToDisk(outputFile: File, excludeFields: Array<String>, prettyPrint: Boolean) {
     val fieldNames = mutableListOf("artifactId", "groupId", "artifactFolder").also {
         it.addAll(excludeFields)
     }
     val jsonGenerator = JsonGenerator.Options().excludeNulls().excludeFieldsByName(fieldNames).build()
     PrintWriter(OutputStreamWriter(outputFile.outputStream(), StandardCharsets.UTF_8), true).use {
-        it.write(jsonGenerator.toJson(this))
+        it.write(jsonGenerator.toJson(this).let { json -> if (prettyPrint) JsonOutput.prettyPrint(json) else json })
     }
 }

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/util/DependencyCollector.kt

@@ -122,8 +122,8 @@ class DependencyCollector(
      */
     private val testCompile = setOf("testCompile", "androidTestCompile")
     private val Configuration.isTest
-        get() = name.contains("test", ignoreCase = true) ||
-                name.contains("androidTest", ignoreCase = true) ||
+        get() = name.startsWith("test", ignoreCase = true) ||
+                name.startsWith("androidTest", ignoreCase = true) ||
                 hierarchy.any { configurationHierarchy ->
                     testCompile.any { configurationHierarchy.name.contains(it, ignoreCase = true) }
                 }