Merge pull request #747 from mikepenz/develop

dev -> main

README.md

@@ -39,7 +39,7 @@
 
 ## Latest releases 🛠
 
-- (Next Gen) Kotlin && Multiplatform && Plugin | [v10.0.1](https://github.com/mikepenz/AboutLibraries/tree/v10.0.1)
+- (Next Gen) Kotlin && Multiplatform && Plugin | [v10.1.0](https://github.com/mikepenz/AboutLibraries/tree/v10.1.0)
 - 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

@@ -6,7 +6,9 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
@@ -37,6 +39,7 @@ import com.mikepenz.aboutlibraries.util.withContext
 @Composable
 fun LibrariesContainer(
     modifier: Modifier = Modifier,
+    lazyListState: LazyListState = rememberLazyListState(),
     contentPadding: PaddingValues = PaddingValues(0.dp),
     librariesBlock: (Context) -> Libs = { context ->
         Libs.Builder().withContext(context).build()
@@ -60,6 +63,7 @@ fun LibrariesContainer(
         Libraries(
             libraries = libs,
             modifier,
+            lazyListState,
             contentPadding,
             showAuthor,
             showVersion,
@@ -79,6 +83,7 @@ fun LibrariesContainer(
 fun Libraries(
     libraries: List<Library>,
     modifier: Modifier = Modifier,
+    lazyListState: LazyListState = rememberLazyListState(),
     contentPadding: PaddingValues = PaddingValues(0.dp),
     showAuthor: Boolean = true,
     showVersion: Boolean = true,
@@ -87,7 +92,7 @@ fun Libraries(
     itemContentPadding: PaddingValues = LibraryDefaults.ContentPadding,
     onLibraryClick: ((Library) -> Unit)? = null,
 ) {
-    LazyColumn(modifier, contentPadding = contentPadding) {
+    LazyColumn(modifier, state = lazyListState, contentPadding = contentPadding) {
         items(libraries) { library ->
             val openDialog = rememberSaveable { mutableStateOf(false) }
 

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

@@ -2,7 +2,9 @@ package com.mikepenz.aboutlibraries.ui.compose
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
@@ -21,6 +23,7 @@ import com.mikepenz.aboutlibraries.entity.Library
 fun LibrariesContainer(
     aboutLibsJson: String,
     modifier: Modifier = Modifier,
+    lazyListState: LazyListState = rememberLazyListState(),
     contentPadding: PaddingValues = PaddingValues(0.dp),
     showAuthor: Boolean = true,
     showVersion: Boolean = true,
@@ -31,6 +34,7 @@ fun LibrariesContainer(
 ) {
     LibrariesContainer({ Libs.Builder().withJson(aboutLibsJson).build() },
         modifier,
+        lazyListState,
         contentPadding,
         showAuthor,
         showVersion,
@@ -48,6 +52,7 @@ fun LibrariesContainer(
 fun LibrariesContainer(
     librariesBlock: () -> Libs,
     modifier: Modifier = Modifier,
+    lazyListState: LazyListState = rememberLazyListState(),
     contentPadding: PaddingValues = PaddingValues(0.dp),
     showAuthor: Boolean = true,
     showVersion: Boolean = true,
@@ -66,6 +71,7 @@ fun LibrariesContainer(
         Libraries(
             libraries = libs,
             modifier,
+            lazyListState,
             contentPadding,
             showAuthor,
             showVersion,
@@ -85,6 +91,7 @@ fun LibrariesContainer(
 fun Libraries(
     libraries: List<Library>,
     modifier: Modifier = Modifier,
+    lazyListState: LazyListState = rememberLazyListState(),
     contentPadding: PaddingValues = PaddingValues(0.dp),
     showAuthor: Boolean = true,
     showVersion: Boolean = true,
@@ -93,7 +100,7 @@ fun Libraries(
     itemContentPadding: PaddingValues = LibraryDefaults.ContentPadding,
     onLibraryClick: ((Library) -> Unit)? = null,
 ) {
-    LazyColumn(modifier, contentPadding = contentPadding) {
+    LazyColumn(modifier, state = lazyListState, contentPadding = contentPadding) {
         items(libraries) { library ->
             Library(library, showAuthor, showVersion, showLicenseBadges, colors, itemContentPadding) {
                 onLibraryClick?.invoke(library)

gradle.properties

@@ -1,6 +1,6 @@
 GROUP=com.mikepenz
-VERSION_NAME=10.0.1
-VERSION_CODE=100001
+VERSION_NAME=10.1.0
+VERSION_CODE=100100
 
 POM_URL=https://github.com/mikepenz/AboutLibraries
 POM_SCM_URL=https://github.com/mikepenz/AboutLibraries

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -13,14 +13,10 @@ abstract class AboutLibrariesCollectorTask : DefaultTask() {
     @Internal
     protected lateinit var collectedDependencies: CollectedContainer
 
-    val dependencyCache: File
-        @OutputFile
-        get() {
-            val folder = File(project.buildDir, "generated/aboutLibraries/").also {
-                it.mkdirs()
-            }
-            return File(folder, "dependency_cache.json")
-        }
+    @OutputFile
+    val dependencyCache: File = File(File(project.buildDir, "generated/aboutLibraries/").also {
+        it.mkdirs()
+    }, "dependency_cache.json")
 
     /**
      * Collect the dependencies via the available configurations for the current project
@@ -31,6 +27,7 @@ abstract class AboutLibrariesCollectorTask : DefaultTask() {
 
     @TaskAction
     fun action() {
+        project.evaluationDependsOnChildren()
         if (!::collectedDependencies.isInitialized) {
             configure()
         }