Fix usage of incorrect BuildLayout

There's two of them, both marked as an `@Service`. One of them is
internal. I was using the internal one. Thank you Gradle.

Author: Jonathing

gradle-plugin/changelog-gradle/src/main/groovy/net/minecraftforge/gitversion/gradle/changelog/package-info.java

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 // TODO [GitVersion Gradle] Documentation
+/// The Changelog plugin, powered by Git Version, enables projects to generate a changelog based on Git version history.
 @NotNullByDefault
 package net.minecraftforge.gitversion.gradle.changelog;
 

gradle-plugin/settings.gradle

@@ -34,8 +34,8 @@ dependencyResolutionManagement {
     versionCatalogs.register('libs') {
         plugin 'licenser',       'net.minecraftforge.licenser'    version '1.2.0'         // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
         plugin 'javadoc-links',  'io.freefair.javadoc-links'      version '8.14'          // https://plugins.gradle.org/plugin/io.freefair.javadoc-links
-        plugin 'gitversion',     'net.minecraftforge.gitversion'  version '3.0.0-beta.22' // https://plugins.gradle.org/plugin/net.minecraftforge.gitversion
-        plugin 'changelog',      'net.minecraftforge.changelog'   version '3.0.0-beta.22' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
+        plugin 'gitversion',     'net.minecraftforge.gitversion'  version '3.0.0-beta.25' // https://plugins.gradle.org/plugin/net.minecraftforge.gitversion
+        plugin 'changelog',      'net.minecraftforge.changelog'   version '3.0.0-beta.25' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
         plugin 'plugin-publish', 'com.gradle.plugin-publish'      version '1.3.1'         // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
         plugin 'shadow',         'com.gradleup.shadow'            version '9.0.2'         // https://plugins.gradle.org/plugin/com.gradleup.shadow
 
@@ -51,8 +51,8 @@ dependencyResolutionManagement {
 
         // GradleUtils
         // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
-        library 'gradleutils-shared', 'net.minecraftforge',             'gradleutils-shared'                           version '3.0.0-beta.27'
-        library 'gradleutils-plugin', 'net.minecraftforge.gradleutils', 'net.minecraftforge.gradleutils.gradle.plugin' version '3.0.0-beta.28'
+        library 'gradleutils-shared', 'net.minecraftforge',             'gradleutils-shared'                           version '3.0.0-beta.30'
+        library 'gradleutils-plugin', 'net.minecraftforge.gradleutils', 'net.minecraftforge.gradleutils.gradle.plugin' version '3.0.0-beta.30'
 
         // Git Version
         library 'gson',   'com.google.code.gson', 'gson' version '2.13.1'

gradle-plugin/src/main/groovy/net/minecraftforge/gitversion/gradle/GitVersionExtensionImpl.groovy

@@ -14,7 +14,6 @@ import org.gradle.api.model.ObjectFactory
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.ProviderFactory
-import org.gradle.initialization.layout.BuildLayout
 import org.jetbrains.annotations.Nullable
 
 import javax.inject.Inject
@@ -25,19 +24,17 @@ import javax.inject.Inject
     private final Property<Output> gitversion
 
     protected abstract @Inject ObjectFactory getObjects()
-    protected abstract @Inject BuildLayout getBuildLayout()
     protected abstract @Inject ProviderFactory getProviders()
 
     @Inject
-    GitVersionExtensionImpl(GitVersionPlugin plugin, ExtensionAware target) {
-        @Nullable final project = target instanceof Project ? target : null
-
+    GitVersionExtensionImpl(GitVersionPlugin plugin, ExtensionAware target, Directory projectDirectory) {
         this.problems = this.objects.newInstance(GitVersionProblems)
         this.gitversion = this.objects.property(Output)
-                              .value(GitVersionValueSource.of(plugin, this.providers, project?.layout?.projectDirectory?.asFile ?: this.buildLayout.rootDirectory))
+                              .value(GitVersionValueSource.of(plugin, this.providers, projectDirectory))
                               .tap { disallowChanges(); finalizeValueOnRead() }
 
-        project?.afterEvaluate { this.finish(it) }
+        if (target instanceof Project)
+            target.afterEvaluate { this.finish(it) }
     }
 
     @CompileDynamic

gradle-plugin/src/main/groovy/net/minecraftforge/gitversion/gradle/GitVersionPlugin.groovy

@@ -31,15 +31,16 @@ abstract class GitVersionPlugin extends EnhancedPlugin<ExtensionAware> {
 
     @Override
     void setup(ExtensionAware target) {
-        if (target instanceof Project && target.layout.projectDirectory.asFile == this.buildLayout.rootDirectory.asFile) {
+        // Gradle 9.0.0 removes the ability to move the settings.gradle file, so it is guaranteed to be the root directory
+        if (target instanceof Project && this.projectLayout.projectDirectory.asFile == this.projectLayout.settingsDirectory.asFile) {
             var gitversion = target.gradle.extensions.findByType(GitVersionExtension)
             if (gitversion !== null) {
                 target.extensions.add('gitversion', gitversion)
                 return
             }
         }
 
-        var gitversion = target.extensions.findByType(GitVersionExtension) ?: target.extensions.create(GitVersionExtension.NAME, GitVersionExtensionImpl, this, target)
+        var gitversion = target.extensions.findByType(GitVersionExtension) ?: target.extensions.create(GitVersionExtension.NAME, GitVersionExtensionImpl, this, target, this.workingProjectDirectory().get())
         if (target instanceof Settings) {
             target.gradle.extensions.add(GitVersionExtension.NAME, gitversion)
             target.gradle.beforeProject { Project project ->

gradle-plugin/src/main/groovy/net/minecraftforge/gitversion/gradle/GitVersionValueSource.groovy

@@ -8,6 +8,8 @@ import groovy.transform.CompileStatic
 import groovy.transform.PackageScope
 import net.minecraftforge.gitversion.gradle.common.GitVersionTools
 import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.Directory
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
@@ -27,23 +29,23 @@ import static net.minecraftforge.gitversion.gradle.GitVersionPlugin.LOGGER
     static interface Parameters extends ValueSourceParameters {
         ConfigurableFileCollection getClasspath()
 
-        Property<String> getProjectPath()
+        DirectoryProperty getProjectPath()
     }
 
     @Inject
     GitVersionValueSource() {}
 
     protected abstract @Inject ExecOperations getExecOperations()
 
-    @PackageScope static Provider<GitVersionExtensionInternal.Output> of(GitVersionPlugin plugin, ProviderFactory providers, File projectDirectory) {
+    @PackageScope static Provider<GitVersionExtensionInternal.Output> of(GitVersionPlugin plugin, ProviderFactory providers, Directory projectDirectory) {
         providers.of(GitVersionValueSource) { spec ->
             spec.parameters { parameters ->
                 parameters.classpath.from(plugin.getTool(GitVersionTools.GITVERSION))
                 // NOTE: We are NOT manually setting the java launcher this time
                 //  Gradle 9 requires Java 17 to run, and so does Git Version
                 //  We can count on the daemon JVM being 17 or higher without needing the project to apply the 'java' plugin
 
-                parameters.projectPath.set(projectDirectory.absolutePath)
+                parameters.projectPath.set(projectDirectory)
             }
         }.map { Util.fromJson(it, GitVersionExtensionInternal.Output) }
     }
@@ -62,7 +64,7 @@ import static net.minecraftforge.gitversion.gradle.GitVersionPlugin.LOGGER
 
             exec.args(
                 '--json',
-                '--project-dir', parameters.projectPath.get()
+                '--project-dir', parameters.projectPath.locationOnly.get().asFile
             )
         }
 

gradle-plugin/src/main/groovy/net/minecraftforge/gitversion/gradle/package-info.java

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 // TODO [GitVersion Gradle] Documentation
+/// The Git Version plugin enables builds to get version numbers based off of Git version history and tags.
 @NotNullByDefault
 package net.minecraftforge.gitversion.gradle;
 

settings.gradle

@@ -30,7 +30,7 @@ dependencyResolutionManagement {
         // Plugins
         plugin 'javadoc-links', 'io.freefair.javadoc-links'      version '8.14'
         plugin 'licenser',      'net.minecraftforge.licenser'    version '1.2.0'
-        plugin 'gradleutils',   'net.minecraftforge.gradleutils' version '3.0.0-beta.20'
+        plugin 'gradleutils',   'net.minecraftforge.gradleutils' version '3.0.0-beta.30'
         plugin 'shadow',        'com.gradleup.shadow'            version '9.0.2'
 
         // Git

src/main/java/net/minecraftforge/gitver/api/GitVersion.java

@@ -263,6 +263,16 @@ sealed interface Info extends Serializable permits GitVersionInternal.Info {
      */
     String getProjectPath();
 
+    /**
+     * Gets the relative path string of a given file.
+     * <p>
+     * This path string is calculated using the
+     * {@linkplain java.nio.file.Path#relativize(java.nio.file.Path) relative path} from either the
+     * {@linkplain #getProject() path}.
+     *
+     * @param file The file to get the relative path to
+     * @return The relative path string
+     */
     String getRelativePath(File file);
 
     /**