Merge pull request #1184 from mikepenz/develop

dev -> main

Author: mikepenz

.github/ci-gradle.properties

@@ -6,3 +6,7 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 # parallel kapt
 kapt.use.worker.api=true
+
+
+# Disable warning as errors due to klib conflict...
+com.mikepenz.kotlin.warningsAsErrors.enabled=false

.github/workflows/ci.yml

@@ -44,17 +44,14 @@ jobs:
           restore-keys: |
             gradle-${{ runner.os }}-
 
-      - name: Prepare Gradle Publish properties
-        if: matrix.os == 'macos-latest'
-        run: |
-          echo "gradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }}" >> ~/.gradle/gradle.properties
-          echo "gradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}" >> ~/.gradle/gradle.properties
-
       - name: Release Plugin
         if: matrix.os == 'macos-latest' && !contains(github.ref, '+')
         run: |
           cd plugin-build
           ./gradlew publishPlugins --no-configuration-cache | true
+        env:
+          GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
+          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
 
       - name: Publish the macOS artifacts
         if: matrix.os == 'macos-latest'
@@ -138,10 +135,6 @@ jobs:
         if: github.event_name  == 'pull_request'
         run: ./gradlew lintDebug
 
-      - name: Verify Screenshot Tests
-        if: false && github.event_name  == 'pull_request'
-        run: ./gradlew validateScreenshotTest
-
       - name: Setup Ruby
         if: github.event_name  == 'pull_request'
         uses: ruby/setup-ruby@v1

.github/workflows/static.yml

@@ -45,13 +45,13 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: Build Page
         run: |
-          ./gradlew :app-wasm:exportLibraryDefinitions -PaboutLibraries.exportPath=src/commonMain/composeResources/files/
-          ./gradlew :app-wasm:wasmJsBrowserDistribution --no-configuration-cache
+          ./gradlew :app:exportLibraryDefinitionsWasmJs
+          ./gradlew :app:wasmJsBrowserDistribution --no-configuration-cache
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: 'app-wasm/build/dist/wasmJs/productionExecutable'
+          path: 'app/build/dist/wasmJs/productionExecutable'
 
       - name: Deploy to GitHub Pages
         id: deployment

MIGRATION.md

@@ -1,9 +1,18 @@
 ### Upgrade Notes
 
+#### v12.2.0
+
+- **Breaking Change**: Renamed `nameTextStyles` in `libraryTextStyles`/`LibraryTextStyles` to `nameTextStyle` (to align with other styles).
+- **Breaking Change**: Introduced new `libraryPadding()` default function to replace the existing one. This moves to use a new class to hold chip paddings.
+- **Breaking Change**: Wrappers around the `LibrariesContainer` were deprecated in favor of `remember*` functions. To be removed in release `13.x.y`.
+- **Breaking Change**: The `LicenseDialogBody` now also accepts the `Modifier` to include padding in text instead of scrollable container
+- **Deprecate**: Deprecate series of APIs to cleanup and simplify API surface, and simplify maintenance.
+- **Note**: Updated README to suggest new non deprecated API for using `LibrariesContainer` on Android.
+
 #### v12.0.0
 
 - **Dependency Upgrade**: Kotlin 2.1.20
-- **Breaking Changes**: The `Gradle Plugin` and `Compose UI` library have undergone significant changes, including multiple breaking API changes.
+- **Breaking Change**: The `Gradle Plugin` and `Compose UI` library have undergone significant changes, including multiple breaking API changes.
 - **Breaking Change**: The `Gradle Plugin` has moved to a `Property` based configuration schema with nested configs for better organization.
 - **Breaking Change**: The `Gradle Plugin's` configuration options which were `Array` or `List` types have been changed to `Set` types.
 - **Breaking Change**: The `Gradle Plugin` now only has a singular `outputPath` property, to specify where the generated file should be written to.

README.md

@@ -41,6 +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.0](https://github.com/mikepenz/AboutLibraries/tree/12.2.0)
 - Compose 1.8.x | Plugin refactor | [v12.1.2](https://github.com/mikepenz/AboutLibraries/tree/12.1.2)
 - Compose UI updates | Gradle Plugin refresh | [v12.0.1](https://github.com/mikepenz/AboutLibraries/tree/12.0.1)
 
@@ -119,11 +120,13 @@ aboutLibraries {
 
         // Enable fetching of "remote" licenses.  Uses the API of supported source hosts
         // See https://github.com/mikepenz/AboutLibraries#special-repository-support
-        fetchRemoteLicense = true
+        // A `gitHubApiToken` is required for this to work as it fetches information from GitHub's API.
+        fetchRemoteLicense = false
 
         // Enables fetching of "remote" funding information. Uses the API of supported source hosts
         // See https://github.com/mikepenz/AboutLibraries#special-repository-support
-        fetchRemoteFunding = true
+        // A `gitHubApiToken` is required for this to work as it fetches information from GitHub's API.
+        fetchRemoteFunding = false
 
         // Allows to only collect dependencies of specific variants during the `collectDependencies` step.
         // filterVariants.addAll("debug", "release")
@@ -146,7 +149,7 @@ aboutLibraries {
         // Enable pretty printing for the generated JSON file
         prettyPrint = true
     }
-  
+
     exports {
         // Define export configuration per variant.
         create("jvm") {
@@ -186,7 +189,9 @@ aboutLibraries {
 ```
 
 Full documentation of all available gradle plugin
-configurations can be found in the [AboutLibrariesExtension.kt](https://github.com/mikepenz/AboutLibraries/blob/develop/plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExtension.kt) source file.
+configurations can be found in
+the [AboutLibrariesExtension.kt](https://github.com/mikepenz/AboutLibraries/blob/develop/plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExtension.kt)
+source file.
 
 </p>
 </details>
@@ -200,6 +205,16 @@ The plugin offers the ability to add or override library and license details by
 in the `libraries` and `licenses` directories within the configured `configPath`.
 See the [config directory](https://github.com/mikepenz/AboutLibraries/blob/develop/config/) for examples.
 
+## Provide funding information
+
+The plugin offers the ability to add or override funding details by placing a `funding.json` JSON file in the `funding` directory within the configured `configPath`.
+Alternatively the `exportFunding` task can be used to generate this data automatically (ensure to provide a GitHub API Key).
+The task will automatically write the file in the respective folder. Note: It will overwrite the file if it already exists.
+
+```bash
+./gradlew app:exportFunding
+```
+
 ### Libraries
 
 Provide additional or modify existing libraries via a `.json` file per library.
@@ -314,10 +329,9 @@ implementation(libs.aboutlibraries.compose.m3) // Material 3
 ### Usage
 
 ```kotlin
-// Android: Auto-discovery using default resource location (src/main/res/raw/aboutlibraries.json)
-LibrariesContainer(
-    Modifier.fillMaxSize()
-)
+// Android: Provide resource identifier for the `R.raw.aboutlibraries` file.
+val libraries by rememberLibraries(R.raw.aboutlibraries)
+LibrariesContainer(libraries, Modifier.fillMaxSize())
 
 // Multiplatform: Using compose-resources API (e.g., src/commonMain/composeResources/files/aboutlibraries.json)
 val libraries by rememberLibraries {
@@ -502,7 +516,8 @@ Create a custom style for the AboutLibraries UI.
 
 ## Enterprise / Manual JSON Handling
 
-For environments requiring full control over the included `aboutlibraries.json` (e.g., manual verification, CI generation), you can disable automatic task registration and handle generation manually.
+For environments requiring full control over the included `aboutlibraries.json` (e.g., manual verification, CI generation), you can disable automatic task registration and handle
+generation manually.
 
 ```kts
 // build.gradle.kts