Merge pull request #1060 from mikepenz/develop

dev -> main

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-14, ubuntu-latest, windows-latest]
+        os: [ macos-14, ubuntu-latest, windows-latest ]
 
     runs-on: ${{matrix.os}}
 
@@ -153,13 +153,10 @@ jobs:
         run: |
           echo "${{ secrets.KEYSTORE }}" > opensource.jks.asc
           gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "opensource.jks.asc" > "app/opensource.jks"
-          echo "${{ secrets.SIGNING_GRADLE }}" > signing.gradle.asc
-          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "signing.gradle.asc" > "app/signing.gradle"
-          echo "openSource.signing.file=signing.gradle" >> local.properties
 
       - name: Build Release App
         if: startsWith(github.ref, 'refs/tags/')
-        run: ./gradlew app:assembleStaging app:assembleRelease app:bundleRelease
+        run: ./gradlew app:assembleStaging app:assembleRelease app:bundleRelease -P"com.mikepenz.android.signing.enabled"="true" -P"com.mikepenz.android.signing.storeFile"="app/opensource.jks" -P"com.mikepenz.android.signing.storePassword"="${{ secrets.STORE_PASSWORD }}" -P"com.mikepenz.android.signing.keyAlias"="${{ secrets.KEY_ALIAS }}" -P"com.mikepenz.android.signing.keyPassword"="${{ secrets.KEY_PASSWORD }}"
 
       - name: Collect artifacts
         run: |

README.md

@@ -38,7 +38,7 @@
 ## Latest releases 🛠
 
 - Compile 35 | Gradle 7.0+ | [v11.3.0](https://github.com/mikepenz/AboutLibraries/tree/v11.3.0
-- Java 17 | [v11.4.0](https://github.com/mikepenz/AboutLibraries/tree/11.4.0
+- Java 17 | [v11.5.0](https://github.com/mikepenz/AboutLibraries/tree/11.5.0
 
 ## Gradle Plugin
 

aboutlibraries-core/build.gradle.kts

@@ -32,9 +32,7 @@ kotlin {
         val jsMain by getting {
             dependsOn(multiplatformMain)
         }
-        val androidMain by getting {
-            dependsOn(commonMain)
-        }
+        val androidMain by getting
         val wasmJsMain by getting {
             dependsOn(multiplatformMain)
         }

app-desktop/src/commonMain/composeResources/files/aboutlibraries.json

@@ -1,7 +1,4 @@
 {
-    "metadata": {
-        "generated": "2025-01-03T16:36:56.347Z"
-    },
     "libraries": [
         {
             "uniqueId": "androidx.annotation:annotation",

app/build.gradle.kts

@@ -1,20 +1,14 @@
 import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 import com.mikepenz.aboutlibraries.plugin.DuplicateRule
 import com.mikepenz.aboutlibraries.plugin.StrictMode
-import org.jetbrains.kotlin.konan.properties.Properties
 
 plugins {
-    kotlin("android")
-    id("com.mikepenz.convention.android-application")
     id("com.mikepenz.convention.kotlin-multiplatform")
+    id("com.mikepenz.convention.android-application")
     id("com.mikepenz.convention.compose")
     id("com.mikepenz.aboutlibraries.plugin")
 }
 
-if (openSourceSigningFile != null) {
-    apply(from = openSourceSigningFile)
-}
-
 android {
     namespace = "com.mikepenz.aboutlibraries.sample"
 
@@ -138,14 +132,3 @@ configurations.configureEach {
     resolutionStrategy.force(libs.fastAdapter.core)
     resolutionStrategy.force(libs.iconics.core)
 }
-
-private val openSourceSigningFile: String?
-    get() {
-        val k = "openSource.signing.file"
-        return Properties().also { prop ->
-            rootProject.file("local.properties").takeIf { it.exists() }?.let {
-                prop.load(it.inputStream())
-            }
-        }.getProperty(k, null) ?: if (project.hasProperty(k)) project.property(k)
-            ?.toString() else null
-    }

build.gradle.kts

@@ -18,9 +18,4 @@ plugins {
     alias(baseLibs.plugins.mavenPublish) apply false
 
     alias(libs.plugins.navSafeArgs) apply false
-}
-
-allprojects {
-    group = ext.get("GROUP")!!
-    version = ext.get("VERSION_NAME")!!
 }

gradle.properties

@@ -1,7 +1,7 @@
 GROUP=com.mikepenz
 
-VERSION_NAME=11.4.0
-VERSION_CODE=110400
+VERSION_NAME=11.5.0
+VERSION_CODE=110500
 
 POM_URL=https://github.com/mikepenz/AboutLibraries
 POM_SCM_URL=https://github.com/mikepenz/AboutLibraries

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-conventionPlugin = "0.1.0"
+conventionPlugin = "0.1.5"
 # kotlin
 kotlinxSerialization = "1.7.3"
 kotlinxCollections = "0.3.8"
 # androidx
-activity = "1.9.3"
+activity = "1.10.0"
 cardview = "1.0.0"
 constraintLayout = "2.2.0"
 core = "1.15.0"
 lifecycle = { require = "2.8.7" }
 navigation = "2.8.5"
-recyclerView = "1.3.2"
+recyclerView = "1.4.0"
 # google
 material = "1.12.0"
 # other

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

plugin-build/build.gradle.kts

@@ -2,6 +2,7 @@ import java.io.FileInputStream
 import java.util.*
 
 plugins {
+    alias(baseLibs.plugins.kotlinJvm) apply false
     alias(libs.plugins.conventionPlugin)
     alias(baseLibs.plugins.dokka)
     alias(baseLibs.plugins.mavenPublish)

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.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

plugin-build/gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

plugin-build/plugin/build.gradle.kts

@@ -19,8 +19,8 @@ gradlePlugin {
 
     plugins {
         create("aboutlibsPlugin") {
-            id = "${project.group}"
-            implementationClass = "${project.group}.AboutLibrariesPlugin"
+            id = "$group"
+            implementationClass = "$group.AboutLibrariesPlugin"
             description = "Resolve all dependencies used in a gradle module, with associated license and further information."
             displayName = "AboutLibraries Library Gradle Plugin"
             tags = listOf("libraries", "licenses", "android")

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

@@ -216,6 +216,18 @@ abstract class AboutLibrariesExtension {
      */
     var gitHubApiToken: String? = null
 
+    /**
+     * Enable the inclusion of generated MetaData.
+     * Warning: This includes the generated date, making the build non-reproducible.
+     *
+     * ```
+     * aboutLibraries {
+     *   includeMetaData = true
+     * }
+     * ```
+     */
+    var includeMetaData: Boolean = false
+
     /**
      * Defines fields which will be excluded during the serialisation of the metadata output file.
      *

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

@@ -4,20 +4,13 @@ import com.mikepenz.aboutlibraries.plugin.mapping.Library
 import com.mikepenz.aboutlibraries.plugin.mapping.License
 import com.mikepenz.aboutlibraries.plugin.model.writeToDisk
 import com.mikepenz.aboutlibraries.plugin.util.forLicense
-import org.gradle.api.file.Directory
 import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.file.RegularFile
-import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 import org.slf4j.LoggerFactory
-import java.io.File
-import java.util.Locale
+import java.util.*
 
 @CacheableTask
 abstract class AboutLibrariesTask : BaseAboutLibrariesTask() {
@@ -104,7 +97,7 @@ abstract class AboutLibrariesTask : BaseAboutLibrariesTask() {
 
         // write to disk
         val combinedLibrariesOutputFile = resultDirectory.file(outputFileName).get().asFile
-        result.writeToDisk(combinedLibrariesOutputFile, excludeFields, extension.prettyPrint)
+        result.writeToDisk(combinedLibrariesOutputFile, includeMetaData, excludeFields, prettyPrint)
     }
 
     companion object {

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

@@ -7,12 +7,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.file.RegularFile
 import org.gradle.api.provider.Provider
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.PathSensitive
-import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.*
 import org.slf4j.LoggerFactory
 import java.io.File
 import javax.inject.Inject
@@ -25,7 +20,8 @@ abstract class BaseAboutLibrariesTask : DefaultTask() {
     @Internal
     protected val extension = project.extensions.findByType(AboutLibrariesExtension::class.java)!!
 
-    @Internal
+    @Optional
+    @Input
     open var variant: Provider<String?> = project.provider { null }
 
     @Inject
@@ -57,6 +53,9 @@ abstract class BaseAboutLibrariesTask : DefaultTask() {
     @Input
     val exclusionPatterns = extension.exclusionPatterns
 
+    @Input
+    val includePlatform = extension.includePlatform
+
     @Input
     val duplicationMode = extension.duplicationMode
 
@@ -88,6 +87,12 @@ abstract class BaseAboutLibrariesTask : DefaultTask() {
     @Input
     val excludeFields = extension.excludeFields
 
+    @Input
+    val includeMetaData = extension.includeMetaData
+
+    @Input
+    val prettyPrint = extension.prettyPrint
+
     @Suppress("UNCHECKED_CAST")
     protected fun readInCollectedDependencies(): CollectedContainer {
         try {

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

@@ -25,7 +25,7 @@ class MetaData(
         .format(Calendar.getInstance().toInstant()),
 )
 
-fun ResultContainer.writeToDisk(outputFile: File, excludeFields: Array<String>, prettyPrint: Boolean) {
+fun ResultContainer.writeToDisk(outputFile: File, includeMetaData: Boolean, excludeFields: Array<String>, prettyPrint: Boolean) {
     val allowedExclusionQualifiers = setOf(
         ResultContainer::class.simpleName,
         Library::class.simpleName,
@@ -42,7 +42,14 @@ fun ResultContainer.writeToDisk(outputFile: File, excludeFields: Array<String>,
         "${Library::class.simpleName}.${Library::artifactFolder.name}"
     )
     val excludedUnqualifiedFieldNames = mutableSetOf<String>()
-    excludeFields.forEach { excludedField ->
+
+    // by default remove the metadata element
+    val excludedFields = excludeFields.toMutableSet()
+    if (!includeMetaData) {
+        excludedFields.add("ResultContainer.metadata")
+    }
+
+    excludedFields.forEach { excludedField ->
         val segments = excludedField.split(".")
         if (segments.size == 2 && allowedExclusionQualifiers.contains(segments.first())) {
             excludedQualifiedFieldNames.add(excludedField)

plugin-build/settings.gradle.kts

@@ -22,7 +22,7 @@ dependencyResolutionManagement {
             from(files("../gradle/libs.versions.toml"))
         }
         create("baseLibs") {
-            from("com.mikepenz:version-catalog:0.0.4")
+            from("com.mikepenz:version-catalog:0.1.1")
         }
     }
 }

settings.gradle.kts

@@ -20,7 +20,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("baseLibs") {
-            from("com.mikepenz:version-catalog:0.1.0")
+            from("com.mikepenz:version-catalog:0.1.2")
         }
     }
 }