- update to gradle 7.0.2

- add required annotations - FIX #637
mikepenz · May 16, 2021 · 69cdf20 · 69cdf20
1 parent 82518cb
commit 69cdf20
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin-build/gradle/wrapper/gradle-wrapper.properties b/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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/.../main/groovy/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExportComplianceTask.groovy b/.../main/groovy/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExportComplianceTask.groovy
@@ -1,6 +1,7 @@
 package com.mikepenz.aboutlibraries.plugin
 
 import com.mikepenz.aboutlibraries.plugin.mapping.License
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 
 import java.nio.file.Files
@@ -17,24 +18,28 @@ public class AboutLibrariesExportComplianceTask extends BaseAboutLibrariesTask {
         this.variant = variant
     }
 
+    @Internal
     String getVariant() {
         return variant
     }
 
+    @Internal
     Set<License> getNeededLicenses() {
         return neededLicenses
     }
 
+    @Internal
     Set<String> getLibrariesWithoutLicenses() {
         return librariesWithoutLicenses
     }
 
+    @Internal
     HashMap<String, HashSet<String>> getUnknownLicenses() {
         return unknownLicenses
     }
 
     def gatherDependencies(def project) {
-        final def exportPath = project.getProperty("exportPath")
+        final def exportPath = project.hasProperty("exportPath") ? project.getProperty("exportPath") : project.rootDir.absolutePath
         final def artifactGroups = project.hasProperty("artifactGroups") ? project.getProperty("artifactGroups") : ""
 
         if (exportPath == null) {

diff --git a/...plugin/src/main/groovy/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExportTask.groovy b/...plugin/src/main/groovy/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExportTask.groovy
@@ -2,6 +2,7 @@ package com.mikepenz.aboutlibraries.plugin
 
 import com.mikepenz.aboutlibraries.plugin.mapping.License
 import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 
 @CacheableTask
@@ -16,18 +17,22 @@ public class AboutLibrariesExportTask extends BaseAboutLibrariesTask {
         this.variant = variant
     }
 
+    @Internal
     String getVariant() {
         return variant
     }
 
+    @Internal
     Set<License> getNeededLicenses() {
         return neededLicenses
     }
 
+    @Internal
     Set<String> getLibrariesWithoutLicenses() {
         return librariesWithoutLicenses
     }
 
+    @Internal
     HashMap<String, HashSet<String>> getUnknownLicenses() {
         return unknownLicenses
     }