Merge pull request #94 from nulls/feature/gradle-8.x

Upgraded Gradle Wrapper to 8.1.1

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

settings.gradle.kts

@@ -52,5 +52,3 @@ if (System.getenv("CI") == "true") {
         }
     }
 }
-
-enableFeaturePreview("VERSION_CATALOGS")

subprojects/plugin/.stutter/java8.lock

@@ -10,9 +10,14 @@
 6.6.1
 6.7.1
 6.8.3
-6.9.2
+6.9.4
 7.0.2
 7.1.1
 7.2
 7.3.3
-7.4.1
+7.4.2
+7.5.1
+7.6.1
+8.0.2
+8.1.1
+8.2-milestone-1

subprojects/plugin/build.gradle.kts

@@ -110,21 +110,17 @@ tasks {
 }
 
 gradlePlugin {
+    website.set("https://britter.github.io/maven-plugin-development")
+    vcsUrl.set("https://github.com/britter/maven-plugin-development")
     plugins.create("mavenPluginDevelopment") {
         id = "de.benediktritter.maven-plugin-development"
         displayName = "Maven plugin development plugin"
         description = project.description
         implementationClass = "de.benediktritter.maven.plugin.development.MavenPluginDevelopmentPlugin"
+        tags.set(listOf("maven", "mojo", "maven plugin"))
     }
 }
 
-pluginBundle {
-    description = project.description
-    website = "https://britter.github.io/maven-plugin-development"
-    vcsUrl = "https://github.com/britter/maven-plugin-development"
-    tags = listOf("maven", "mojo", "maven plugin")
-}
-
 publishing {
     publications.withType<MavenPublication>() {
         versionMapping {

subprojects/plugin/src/main/kotlin/de/benediktritter/maven/plugin/development/MavenPluginDevelopmentPlugin.kt

@@ -23,9 +23,7 @@ import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescri
 import de.benediktritter.maven.plugin.development.task.UpstreamProjectDescriptor
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ProjectDependency
-import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.jvm.tasks.Jar

subprojects/plugin/src/main/kotlin/de/benediktritter/maven/plugin/development/task/AbstractMavenPluginDevelopmentTask.kt

@@ -25,15 +25,16 @@ import org.codehaus.plexus.component.repository.ComponentDependency
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Classpath
+import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Nested
 
 abstract class AbstractMavenPluginDevelopmentTask : DefaultTask() {
 
     @get:Nested
     abstract val pluginDescriptor: Property<MavenPluginDescriptor>
 
-    @get:Input
+    @get:[InputFiles Classpath]
     abstract val runtimeDependencies: Property<Configuration>
 
     protected fun createPluginDescriptor(): PluginDescriptor {

subprojects/plugin/src/main/kotlin/de/benediktritter/maven/plugin/development/task/GenerateMavenPluginDescriptorTask.kt

@@ -42,13 +42,13 @@ import java.io.File
 @CacheableTask
 abstract class GenerateMavenPluginDescriptorTask : AbstractMavenPluginDevelopmentTask() {
 
-    @get:Input
+    @get:[InputFiles Classpath]
     abstract val classesDirs: Property<FileCollection>
 
     @get:Internal
     abstract val javaClassesDir: DirectoryProperty
 
-    @get:Input
+    @get:[InputFiles PathSensitive(PathSensitivity.RELATIVE)]
     abstract val sourcesDirs: Property<FileCollection>
 
     @get:Nested