Merge pull request #1048 from mikepenz/fix/attempt_improve_config_cach

Investigate config cache support
mikepenz · Jan 4, 2025 · 840b611 · 840b611
2 parents c0e0897 + 8a89e84
commit 840b611
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/.../src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExportComplianceTask.kt b/.../src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExportComplianceTask.kt
@@ -2,11 +2,9 @@ package com.mikepenz.aboutlibraries.plugin
 
 import com.mikepenz.aboutlibraries.plugin.mapping.SpdxLicense
 import org.gradle.api.file.Directory
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Provider
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.*
 import org.gradle.util.GradleVersion
 import org.slf4j.LoggerFactory
 import java.io.File
@@ -15,19 +13,24 @@ import java.nio.file.StandardCopyOption
 
 abstract class AboutLibrariesExportComplianceTask : BaseAboutLibrariesTask() {
 
+    @get:InputDirectory
+    abstract val projectDirectory: DirectoryProperty
+
     @Input
     @Optional
     val exportPath: Provider<Directory> = project.providers.gradleProperty("aboutLibraries.exportPath")
-        .map { path -> project.layout.projectDirectory.dir(path) }
+        .map { path -> projectDirectory.get().dir(path) }
+        .orElse(project.providers.gradleProperty("exportPath").map { path ->
+            projectDirectory.get().dir(path)
+        })
         .orElse(
-            project.providers.gradleProperty("exportPath").map { path -> project.layout.projectDirectory.dir(path) }
-        ).orElse(
             if (GradleVersion.current() < GradleVersion.version("8.8")) {
-                project.isolated.rootProject.projectDirectory.dir(".")
-            } else {
                 LOGGER.info("Fallback to non project isolated safe API for root directory.")
                 // noinspection GradleProjectIsolation
                 project.rootProject.layout.projectDirectory.dir(".")
+            } else {
+                @Suppress("UnstableApiUsage")
+                project.isolated.rootProject.projectDirectory.dir(".")
             }
         )
 

diff --git a/...n-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesPlugin.kt b/...n-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesPlugin.kt
@@ -56,13 +56,15 @@ class AboutLibrariesPlugin : Plugin<Project> {
                 it.variant = project.providers.gradleProperty("aboutLibraries.exportVariant")
                     .orElse(project.providers.gradleProperty("exportVariant"))
 
+                val projectDirectory = project.layout.projectDirectory
+                val buildDirectory = project.layout.buildDirectory
+
                 val exportPath: Provider<Directory> = project.providers.gradleProperty("aboutLibraries.exportPath")
-                    .map { path -> project.layout.projectDirectory.dir(path) }
+                    .map { path -> projectDirectory.dir(path) }
                     .orElse(
-                        project.providers.gradleProperty("exportPath")
-                            .map { path -> project.layout.projectDirectory.dir(path) }
+                        project.providers.gradleProperty("exportPath").map { path -> projectDirectory.dir(path) }
                     ).orElse(
-                        project.layout.buildDirectory.dir("generated/aboutLibraries/")
+                        buildDirectory.dir("generated/aboutLibraries/")
                     )
                 it.resultDirectory.set(exportPath)
 

diff --git a/...rc/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesPluginAndroidExtension.kt b/...rc/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesPluginAndroidExtension.kt
@@ -3,7 +3,7 @@ package com.mikepenz.aboutlibraries.plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.TaskProvider
 import org.slf4j.LoggerFactory
-import java.util.Locale
+import java.util.*
 
 /**
  * Android specific extension for the [AboutLibrariesPlugin]
@@ -91,10 +91,11 @@ object AboutLibrariesPluginAndroidExtension {
             "exportComplianceLibraries${variant.name.capitalize(Locale.ENGLISH)}",
             AboutLibrariesExportComplianceTask::class.java
         ) {
-            it.description =
-                "Writes all libraries with their source and their license in CSV format to the configured directory"
+            it.description = "Writes all libraries with their source and their license in CSV format to the configured directory"
             it.group = "Help"
             it.variant = project.provider { variant.name }
+            it.projectDirectory.set(project.layout.projectDirectory)
+
             it.dependsOn(collectTask)
         }
     }