Merge pull request #1274 from mikepenz/develop

dev -> main

Author: mikepenz

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - uses: actions/setup-java@v5
         with:
@@ -35,7 +35,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v5
 
       - name: Cache konan
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
@@ -92,7 +92,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 100
 
@@ -165,14 +165,14 @@ jobs:
           find . -name "*-release.aab" -type f -exec cp {} "artifacts" \;
 
       - name: Archive Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: "App-Artifacts"
           path: artifacts/*
 
       - name: Build Changelog
         id: github_release
-        uses: mikepenz/release-changelog-builder-action@v5
+        uses: mikepenz/release-changelog-builder-action@v6
         if: startsWith(github.ref, 'refs/tags/')
         with:
           configuration: ".github/config/configuration.json"

.github/workflows/gradle-dependency-submission.yml

@@ -11,7 +11,7 @@ jobs:
       contents: write
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - uses: actions/setup-java@v5
         with:

.github/workflows/static.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Pages
         uses: actions/configure-pages@v5

.gitignore

@@ -19,3 +19,5 @@ docs
 /.bundle/
 /vendor/*
 /.kotlin/
+
+iosApp/iosApp.xcodeproj

MIGRATION.md

@@ -1,5 +1,27 @@
 ### Upgrade Notes
 
+#### v13.2.0
+
+- **Breaking Change**: Some underlying APIs start to require API 23 instead of 21.
+    - `org.jetbrains.compose.components.resources`
+- **Dependency Upgrade**: Kotlin 2.3.0
+- **Dependency Upgrade**: Compose 1.10.x
+
+#### v13.1.0
+
+- **Behaviour Change**: The `Gradle Plugin` now by default enables MERGING duplicates with EXACT matches. In prior releases, duplicates would be kept.
+```kotlin
+// To enable the prior behavior, you can simply configure this in your build script
+aboutLibraries {
+    library {
+        duplicationMode = DuplicateMode.KEEP
+        duplicationRule = DuplicateRule.SIMPLE
+    }
+}
+
+```
+
+
 #### v13.0.0
 
 - **Breaking Change**: Deprecated APIs from v12.x.y were removed

README.md

@@ -41,9 +41,9 @@ This library collects dependency details, including licenses at compile time, an
 
 ## Latest releases 🛠
 
+- Compose 1.10.x | [v13.2.0](https://github.com/mikepenz/AboutLibraries/tree/13.2.0)
 - Compose 1.9.x | Split Gradle Plugin | [v13.1.0](https://github.com/mikepenz/AboutLibraries/tree/13.1.0)
 - 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
 
@@ -82,6 +82,9 @@ id("com.mikepenz.aboutlibraries.plugin")
 To improve configuration cache compatibility and reduce unintended behavior, the auto registering as part of the Android build was moved into its own plugin in v13.x.y.
 
 ```kotlin
+// Root build.gradle.kts
+id("com.mikepenz.aboutlibraries.plugin.android") version "${latestAboutLibsRelease}" apply false
+
 // App build.gradle.kts
 id("com.mikepenz.aboutlibraries.plugin.android")
 ```

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

@@ -16,7 +16,7 @@ fun Libs.Builder.withJson(byteArray: ByteArray): Libs.Builder {
 }
 
 /**
- * Auto discover the generated library definition data by the default name and location
+ * Auto-discover the generated library definition data by the default name and location
  * `res/raw/aboutlibraries.json`
  *
  * Please remember to disable resource shrinking when using this API.
@@ -25,7 +25,7 @@ fun Libs.Builder.withJson(byteArray: ByteArray): Libs.Builder {
  * ```
  * <?xml version="1.0" encoding="utf-8"?>
  * <resources xmlns:tools="http://schemas.android.com/tools"
- *     tools:keep="@raw/aboutlibraries.json" />
+ *     tools:keep="@raw/aboutlibraries" />
  * ```
  *
  * @param ctx context used to retrieve the resource
@@ -87,4 +87,4 @@ internal fun <T> JSONObject?.forEachObject(block: JSONObject.(key: String) -> T)
         targetList.add(block.invoke(getJSONObject(it), it))
     }
     return targetList
-}
+}

aboutlibraries/src/androidMain/kotlin/com/mikepenz/aboutlibraries/viewmodel/LibsViewModel.kt

@@ -2,7 +2,6 @@
 
 package com.mikepenz.aboutlibraries.viewmodel
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageInfo
 import android.os.Build
@@ -24,7 +23,7 @@ import kotlinx.coroutines.withContext
 
 class LibsViewModel(
     // TODO replace with non ctx solution?
-    @SuppressLint("StaticFieldLeak") private val ctx: Context,
+    @Suppress("StaticFieldLeak") private val ctx: Context,
     internal val builder: LibsBuilder, // ui module
     private val libsBuilder: Libs.Builder,
 ) : ViewModel() {

app/build.gradle.kts

@@ -134,6 +134,9 @@ dependencies {
     // used only tho showcase multi flavor support
     "stagingImplementation"(libs.okhttp.core)
 
+    // https://mvnrepository.com/artifact/androidx.compose.material/material-icons-core
+    implementation("androidx.compose.material:material-icons-extended:1.7.8")
+
     // used to test matching of license names
 //    implementation("com.github.librepdf:openpdf:1.3.43")
 //    implementation("com.google.android.play:app-update-ktx:2.1.0")

app/gradle.properties

@@ -1,3 +1,4 @@
 com.mikepenz.multiplatform.enabled=true
 com.mikepenz.targets.enabled=false
-com.mikepenz.hotreload.enabled=true
+com.mikepenz.hotreload.enabled=true
+com.mikepenz.android.minSdk=23