Merge pull request #1163 from mikepenz/develop

dev -> main

Author: mikepenz

README.md

@@ -42,7 +42,7 @@ This library collects dependency details, including licenses at compile time, an
 ## Latest releases 🛠
 
 - Compose UI updates | Gradle Plugin refresh | [v12.0.1](https://github.com/mikepenz/AboutLibraries/tree/12.0.1)
-- Compose 1.8.x | Plugin refactor | [v12.1.0](https://github.com/mikepenz/AboutLibraries/tree/12.1.0)
+- Compose 1.8.x | Plugin refactor | [v12.1.1](https://github.com/mikepenz/AboutLibraries/tree/12.1.1)
 
 ## Gradle Plugin
 

app-test/README.md

@@ -3,5 +3,5 @@
 ### Generate Dependency Information
 
 ```bash
-./gradlew :app-test:exportLibraryDefinitions -PaboutLibraries.exportPath=files/
+./gradlew :app-test:exportLibraryDefinitions
 ```

app-test/files/aboutlibraries.json

@@ -1,7 +1,7 @@
 GROUP=com.mikepenz
 
-VERSION_NAME=12.1.0
-VERSION_CODE=120100
+VERSION_NAME=12.1.1
+VERSION_CODE=120101
 
 POM_URL=https://github.com/mikepenz/AboutLibraries
 POM_SCM_URL=https://github.com/mikepenz/AboutLibraries

gradle.properties

@@ -25,6 +25,12 @@ data class License(
         } else {
             field
         }
+        set(value) {
+            // do not set `NOASSERTION` as spdxId
+            if (value != "NOASSERTION") {
+                field = value
+            }
+        }
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -51,7 +57,7 @@ data class License(
  * Ensures and applies fixes to the library names (shorten, ...)
  */
 private fun resolveLicenseId(name: String, url: String?): String? {
-    for (l: SpdxLicense in SpdxLicense.values()) {
+    for (l: SpdxLicense in SpdxLicense.entries) {
         val matcher = l.customMatcher
         if (l.id.equals(name, true) || l.name.equals(name, true) || l.fullName.equals(name, true) || (matcher != null && matcher.invoke(name, url))) {
             return l.id

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

@@ -151,6 +151,7 @@ enum class SpdxLicense(
     EPL_1_0("Eclipse Public License 1.0", "EPL-1.0"),
     EPL_2_0("Eclipse Public License 2.0", "EPL-2.0", "epl_2_0", customMatcher = { _, url ->
         url == "https://www.eclipse.org/legal/epl-v20.html"
+            || url == "https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt"
     }),
     ErlPL_1_1("Erlang Public License v1.1", "ErlPL-1.1"),
     etalab_2_0("Etalab Open License 2.0", "etalab-2.0"),
@@ -392,19 +393,19 @@ enum class SpdxLicense(
 
     // Special handling section
     Apache_2_0("Apache License 2.0", "Apache-2.0", customMatcher = { name, url ->
-        name.contains("Apache", true) || url?.endsWith("LICENSE-2.0.txt") == true
+        name.contains("Apache", true)
+            || url?.endsWith("LICENSE-2.0.txt") == true
     }),
     BSD_2_Clause("BSD 2-Clause \"Simplified\" License", "BSD-2-Clause", customMatcher = { name, url ->
         name.equals("BSD 2-Clause License", true)
             || url?.endsWith("opensource.org/licenses/BSD-2-Clause", true) == true
             || url?.endsWith("opensource.org/licenses/bsd-license", true) == true
     }),
     BSD_3_Clause("BSD 3-Clause \"New\" or \"Revised\" License", "BSD-3-Clause", customMatcher = { name, url ->
-        name.equals("New BSD License", true) || name.equals("Modified BSD License", true) || name.equals(
-            "BSD 3-clause",
-            true
-        ) ||
-            url?.endsWith("opensource.org/licenses/BSD-3-Clause", true) == true
+        name.equals("New BSD License", true)
+            || name.equals("Modified BSD License", true)
+            || name.equals("BSD 3-clause", true)
+            || url?.endsWith("opensource.org/licenses/BSD-3-Clause", true) == true
     }),
     MIT("MIT License", "MIT", customMatcher = { name, _ ->
         name.contains("MIT", true)
@@ -426,7 +427,10 @@ enum class SpdxLicense(
     GPL_2_0_CPE(
         "GNU General Public License, version 2, with the Classpath Exception",
         "GPL-2.0-CPE",
-        customUrl = "https://openjdk.org/legal/gplv2+ce.html"
+        customUrl = "https://openjdk.org/legal/gplv2+ce.html",
+        customMatcher = { name, url ->
+            url?.equals("https://www.gnu.org/software/classpath/license.html") == true
+        }
     );
 
     fun getUrl(): String = customUrl ?: "https://spdx.org/licenses/$id.html"

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

@@ -208,9 +208,12 @@ internal class DependencyCollector(
         if (artifactVersion.isNullOrBlank()) LOGGER.info("----> Failed to identify version for: $uniqueId")
         val libraryWebsite = chooseStringValue(pom, parentRawModel) { it.url }
 
-        val licenses = combineValues(pom, parentRawModel) { it.licenses }.map { License(it.name, it.url) }.toHashSet()
+        val licenses = chooseValue(pom, parentRawModel) { it.licenses }?.map {
+            if (it.name == null) LOGGER.info("----> License name was null url: ${it.url} for: $uniqueId")
+            License(it.name ?: "", it.url)
+        }?.toHashSet() ?: emptySet()
         val scm = chooseValue(pom, parentRawModel) { it.scm }?.let { Scm(it.connection, it.developerConnection, it.url) }
-        val developers = combineValues(pom, parentRawModel) { it.developers }.map { Developer(it.name, it.organizationUrl) }.toHashSet().toList()
+        val developers = chooseValue(pom, parentRawModel) { it.developers }?.map { Developer(it.name, it.organizationUrl) }?.toHashSet()?.toList() ?: emptyList()
         val organization = chooseValue(pom, parentRawModel) { it.organization }?.let { Organization(it.name, it.url) }
         return DependencyData(
             dependencyCoordinates = coordinates,
@@ -233,13 +236,6 @@ internal class DependencyCollector(
 
     private fun <T> chooseValue(pom: Model, parentRawModel: List<Model>, block: (Model) -> T?): T? = pom.let(block) ?: parentRawModel.firstOrNull()?.let(block)
 
-    private fun <T> combineValues(pom: Model, parentRawModel: List<Model>, block: (Model) -> List<T>): List<T> {
-        val combined = mutableListOf<T>()
-        pom.let(block).also { combined.addAll(it) }
-        parentRawModel.onEach { block(it).also { value -> combined.addAll(value) } }
-        return combined
-    }
-
     /**
      * Fetches the pom files for all [ResolvedVariantResult]s.
      *