Merge pull request #901 from mikepenz/develop

dev -> main

.github/config/configuration.json

@@ -21,7 +21,8 @@
     {
       "title": "## 💬 Other",
       "labels": [
-        "other"
+        "other",
+        "dependencies"
       ]
     }
   ]

.github/workflows/ci.yml

@@ -188,7 +188,7 @@ jobs:
 
       - name: Build Changelog
         id: github_release
-        uses: mikepenz/release-changelog-builder-action@v3
+        uses: mikepenz/release-changelog-builder-action@v4
         if: startsWith(github.ref, 'refs/tags/')
         with:
           configuration: ".github/config/configuration.json"

README.md

@@ -39,7 +39,7 @@
 
 ## Latest releases 🛠
 
-- (Next Gen) Kotlin && Multiplatform && Plugin | [v10.8.0](https://github.com/mikepenz/AboutLibraries/tree/v10.8.0)
+- (Next Gen) Kotlin && Multiplatform && Plugin | [v10.8.1](https://github.com/mikepenz/AboutLibraries/tree/v10.8.1)
 - Kotlin && Gradle Plugin | [v8.9.4](https://github.com/mikepenz/AboutLibraries/tree/v8.9.4)
 
 ## Gradle Plugin

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

@@ -9,11 +9,7 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.AlertDialog
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
+import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
@@ -22,6 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
@@ -58,6 +55,8 @@ fun LibrariesContainer(
     onLibraryClick: ((Library) -> Unit)? = null,
 ) {
     val context = LocalContext.current
+    val uriHandler = LocalUriHandler.current
+
     val libraries = produceState<Libs?>(null) {
         value = withContext(Dispatchers.IO) {
             librariesBlock(context)
@@ -86,6 +85,8 @@ fun LibrariesContainer(
                     onLibraryClick(library)
                 } else if (!license?.htmlReadyLicenseContent.isNullOrBlank()) {
                     openDialog.value = library
+                } else if (!license?.url.isNullOrBlank()) {
+                    license?.url?.also { uriHandler.openUri(it) }
                 }
             },
         )

gradle.properties

@@ -1,7 +1,7 @@
 GROUP=com.mikepenz
 
-VERSION_NAME=10.8.0
-VERSION_CODE=100801
+VERSION_NAME=10.8.1
+VERSION_CODE=100810
 POM_URL=https://github.com/mikepenz/AboutLibraries
 POM_SCM_URL=https://github.com/mikepenz/AboutLibraries
 POM_SCM_CONNECTION=scm:[email protected]:mikepenz/AboutLibraries.git

gradle/libs.versions.toml

@@ -6,18 +6,18 @@ minSdk = "21"
 targetSdk = "33"
 # build
 gradleBuild = "8.0.2"
-buildTools = "33.0.2"
+buildTools = "34.0.0"
 # kotlin
 dokka = "1.8.20"
-kotlinCore = { require = "1.8.21" }
-kotlinCoroutines = { require = "1.7.1" }
+kotlinCore = { require = "1.8.22" }
+kotlinCoroutines = { require = "1.7.2" }
 kotlinxSerialization = "1.5.1"
 # compose
 compose = "1.4.3"
 composeUi = "1.4.3" # foundation / material
-composeCompiler = "1.4.7"
-composejb = "1.4.0"
-composeCompilerJb = "1.4.5"
+composeCompiler = "1.4.8"
+composejb = "1.4.1"
+composeCompilerJb = "1.4.8"
 # androidx
 activity = "1.7.2"
 cardview = "1.0.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugin-build/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -10,28 +10,20 @@ import java.util.*
 
 @CacheableTask
 abstract class AboutLibrariesTask : BaseAboutLibrariesTask() {
-
-    @OutputDirectory
-    var resultDirectory: File = project.file("${project.buildDir}/generated/aboutLibraries/res/")
-
-    @Internal
-    private lateinit var combinedLibrariesOutputFile: File
-
     @Input
     val strictMode = extension.strictMode
 
     @Input
     val outputFileName = extension.outputFileName
 
-    fun getCombinedLibrariesOutputFile(): File {
-        return File(resultDirectory, outputFileName)
-    }
+    @OutputDirectory
+    var resultDirectory: File = project.file("${project.buildDir}/generated/aboutLibraries/res/")
+
+    @OutputFile
+    var combinedLibrariesOutputFile = File(resultDirectory, outputFileName)
 
     @TaskAction
     public fun action() {
-        // ensure directories exist
-        this.combinedLibrariesOutputFile = getCombinedLibrariesOutputFile()
-
         val result = createLibraryProcessor().gatherDependencies()
 
         // validate found licenses match expectation