Merge pull request #1207 from mikepenz/develop

dev -> main

Author: mikepenz

README.md

@@ -41,8 +41,7 @@ This library collects dependency details, including licenses at compile time, an
 
 ## Latest releases 🛠
 
-- Compose 1.8.x | Refined Compose UI Design | [v12.2.3](https://github.com/mikepenz/AboutLibraries/tree/12.2.3)
-- Compose 1.8.x | Plugin refactor | [v12.1.2](https://github.com/mikepenz/AboutLibraries/tree/12.1.2)
+- Compose 1.8.x | Refined Compose UI Design | [v12.2.4](https://github.com/mikepenz/AboutLibraries/tree/12.2.4)
 - Compose UI updates | Gradle Plugin refresh | [v12.0.1](https://github.com/mikepenz/AboutLibraries/tree/12.0.1)
 
 ## Gradle Plugin

aboutlibraries-core/src/androidMain/kotlin/com/mikepenz/aboutlibraries/util/AndroidParser.kt

@@ -34,7 +34,7 @@ actual fun parseData(json: String): Result {
                 Developer(optString("name"), optString("organisationUrl"))
             } ?: emptyList()
             val organization = optJSONObject("organization")?.let {
-                Organization(it.getString("name"), it.optString("url"))
+                Organization(it.optString("name") ?: "", it.optString("url"))
             }
             val scm = optJSONObject("scm")?.let {
                 Scm(

aboutlibraries-core/src/commonMain/kotlin/com/mikepenz/aboutlibraries/entity/Organization.kt

@@ -14,5 +14,5 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class Organization(
     @SerialName("name") val name: String,
-    @SerialName("url") val url: String?
+    @SerialName("url") val url: String?,
 )

aboutlibraries-core/src/multiplatformMain/kotlin/com/mikepenz/aboutlibraries/util/MultiplatformParser.kt

@@ -34,7 +34,7 @@ actual fun parseData(json: String): Result {
                 Developer(optString("name"), optString("organisationUrl"))
             } ?: emptyList()
             val organization = optJSONObject("organization")?.let {
-                Organization(it.getString("name"), it.optString("url"))
+                Organization(it.optString("name") ?: "", it.optString("url"))
             }
             val scm = optJSONObject("scm")?.let {
                 Scm(

aboutlibraries/src/androidMain/kotlin/com/mikepenz/aboutlibraries/util/SerializeableContainer.kt

@@ -1,7 +1,12 @@
 package com.mikepenz.aboutlibraries.util
 
 import com.mikepenz.aboutlibraries.Libs
-import com.mikepenz.aboutlibraries.entity.*
+import com.mikepenz.aboutlibraries.entity.Developer
+import com.mikepenz.aboutlibraries.entity.Funding
+import com.mikepenz.aboutlibraries.entity.Library
+import com.mikepenz.aboutlibraries.entity.License
+import com.mikepenz.aboutlibraries.entity.Organization
+import com.mikepenz.aboutlibraries.entity.Scm
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 import java.io.Serializable
@@ -38,7 +43,7 @@ internal fun SerializableLibs.toLibs() = Libs(
             lib.description,
             lib.website,
             lib.developers.map { Developer(it.name, it.organisationUrl) }.toImmutableList(),
-            lib.organization?.let { Organization(it.name, it.url) },
+            lib.organization?.let { Organization(it.name ?: "", it.url) },
             lib.scm?.let { Scm(it.connection, it.developerConnection, it.url) },
             lib.licenses.map {
                 License(it.name, it.url, it.year, it.spdxId, it.licenseContent, it.hash)
@@ -91,7 +96,7 @@ internal data class SerializableLicense(
 ) : Serializable
 
 internal data class SerializableOrganization(
-    val name: String,
+    val name: String?,
     val url: String?,
 ) : Serializable
 

gradle.properties

@@ -1,7 +1,7 @@
 GROUP=com.mikepenz
 
-VERSION_NAME=12.2.3
-VERSION_CODE=120203
+VERSION_NAME=12.2.4
+VERSION_CODE=120204
 
 POM_URL=https://github.com/mikepenz/AboutLibraries
 POM_SCM_URL=https://github.com/mikepenz/AboutLibraries