Update GradleUtils Shared to fix various issues

Author: Jonathing

gitversion-gradle/settings.gradle

@@ -32,7 +32,7 @@ dependencyResolutionManagement {
     }
 
     versionCatalogs.register('libs') {
-        version 'gradleutils', '3.2.14'
+        version 'gradleutils', '3.2.15'
 
         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

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

@@ -10,7 +10,6 @@ import groovy.transform.PackageScope
 import net.minecraftforge.gradleutils.GenerateActionsWorkflow
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
-import org.gradle.api.logging.LogLevel
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.provider.Property
@@ -21,21 +20,28 @@ import javax.inject.Inject
 
 @CompileStatic
 @PackageScope abstract class GitVersionExtensionImpl implements GitVersionExtensionInternal {
-    private final GitVersionProblems problems
     private final Property<Output> gitversion
 
+    private boolean hasProject
+
     protected abstract @Inject ObjectFactory getObjects()
     protected abstract @Inject ProviderFactory getProviders()
 
     @Inject
     GitVersionExtensionImpl(GitVersionPlugin plugin, ExtensionAware target, Directory projectDirectory) {
-        this.problems = this.objects.newInstance(GitVersionProblems)
         this.gitversion = this.objects.property(Output)
                               .value(GitVersionValueSource.of(plugin, projectDirectory))
                               .tap { disallowChanges(); finalizeValueOnRead() }
 
         if (target instanceof Project)
-            target.afterEvaluate { this.finish(it) }
+            this.attachTo(target)
+    }
+
+    void attachTo(Project project) {
+        if (this.hasProject) return
+
+        this.hasProject = true
+        project.afterEvaluate { this.finish(it) }
     }
 
     @CompileDynamic
@@ -49,11 +55,12 @@ import javax.inject.Inject
             }
         }
 
-        if (this.problems.test('net.minecraftforge.gitversion.log.version')) {
+        final problems = project.objects.newInstance(GitVersionProblems)
+        if (problems.test('net.minecraftforge.gitversion.log.version')) {
             if (project.version === null) {
                 project.logger.warn('WARNING: Project does not have a version despite applying Git Version Gradle!')
             } else {
-                project.logger.lifecycle('{}', project.version)
+                project.logger.lifecycle('Version: {}', project.version)
             }
         }
     }

gitversion-gradle/src/main/groovy/net/minecraftforge/gitversion/gradle/GitVersionExtensionInternal.java

@@ -4,6 +4,7 @@
  */
 package net.minecraftforge.gitversion.gradle;
 
+import org.gradle.api.Project;
 import org.gradle.api.reflect.HasPublicType;
 import org.gradle.api.reflect.TypeOf;
 import org.jetbrains.annotations.NotNullByDefault;
@@ -27,6 +28,8 @@ default TypeOf<?> getPublicType() {
         return TypeOf.typeOf(GitVersionExtension.class);
     }
 
+    void attachTo(Project project);
+
 
     /* VERSIONING */
 

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

@@ -34,6 +34,7 @@ public void setup(ExtensionAware target) {
         if (target instanceof Project project && Objects.equals(this.getProjectLayout().getProjectDirectory().getAsFile(), this.getProjectLayout().getSettingsDirectory().getAsFile())) {
             var gitversion = project.getGradle().getExtensions().findByType(GitVersionExtension.class);
             if (gitversion != null) {
+                ((GitVersionExtensionInternal) gitversion).attachTo(project);
                 target.getExtensions().add("gitversion", gitversion);
                 return;
             }
@@ -43,7 +44,12 @@ public void setup(ExtensionAware target) {
         if (target instanceof Settings settings) {
             var gradle = settings.getGradle();
             gradle.getExtensions().add(GitVersionExtension.NAME, gitversion);
-            gradle.beforeProject(project -> project.setVersion(gitversion.getTagOffset()));
+            gradle.beforeProject(project -> {
+                project.setVersion(gitversion.getTagOffset());
+                ((GitVersionExtensionInternal) gitversion).attachTo(project);
+            });
+        } else if (target instanceof Project project) {
+            ((GitVersionExtensionInternal) gitversion).attachTo(project);
         }
     }
 }