Add provider-friendly methods to extensions

Author: Jonathing

gitversion-gradle/changelog-gradle/src/main/java/net/minecraftforge/gitversion/gradle/changelog/ChangelogExtension.java

@@ -6,6 +6,7 @@
 
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.provider.ProviderConvertible;
 import org.gradle.api.publish.maven.MavenPublication;
 
 /// Configuration for the Changelog plugin.
@@ -37,6 +38,15 @@ public sealed interface ChangelogExtension permits ChangelogExtensionInternal {
     /// @param marker The start marker for the changelog
     void from(Provider<?> marker);
 
+    /// Sets the changelog start marker to use when generating the changelog. This can be a tag name or a commit SHA.
+    ///
+    /// If `null`, the changelog will start from the last merge base commit.
+    ///
+    /// @param marker The start marker for the changelog
+    default void from(ProviderConvertible<?> marker) {
+        this.from(marker.asProvider());
+    }
+
     /// Sets this project's changelog as an artifact for the given publication.
     ///
     /// @param publication The publication

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

@@ -8,6 +8,7 @@
 import org.gradle.api.file.FileSystemLocation;
 import org.gradle.api.file.FileSystemLocationProperty;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.provider.ProviderConvertible;
 import org.jetbrains.annotations.NotNullByDefault;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
@@ -35,9 +36,33 @@ public sealed interface GitVersionExtension permits GitVersionExtensionInternal
 
     String getMCTagOffsetBranch(@UnknownNullability String mcVersion);
 
-    String getMCTagOffsetBranch(String mcVersion, String... allowedBranches);
+    default String getMCTagOffsetBranch(Provider<? extends CharSequence> mcVersion) {
+        return this.getMCTagOffsetBranch(mcVersion.map(Object::toString).getOrNull());
+    }
+
+    default String getMCTagOffsetBranch(ProviderConvertible<? extends CharSequence> mcVersion) {
+        return this.getMCTagOffsetBranch(mcVersion.asProvider());
+    }
+
+    String getMCTagOffsetBranch(@UnknownNullability String mcVersion, String... allowedBranches);
+
+    default String getMCTagOffsetBranch(Provider<? extends CharSequence> mcVersion, String... allowedBranches) {
+        return this.getMCTagOffsetBranch(mcVersion.map(Object::toString).getOrNull(), allowedBranches);
+    }
 
-    String getMCTagOffsetBranch(String mcVersion, Collection<String> allowedBranches);
+    default String getMCTagOffsetBranch(ProviderConvertible<? extends CharSequence> mcVersion, String... allowedBranches) {
+        return this.getMCTagOffsetBranch(mcVersion.asProvider(), allowedBranches);
+    }
+
+    String getMCTagOffsetBranch(@UnknownNullability String mcVersion, Collection<String> allowedBranches);
+
+    default String getMCTagOffsetBranch(Provider<? extends CharSequence> mcVersion, Collection<String> allowedBranches) {
+        return this.getMCTagOffsetBranch(mcVersion.map(Object::toString).getOrNull(), allowedBranches);
+    }
+
+    default String getMCTagOffsetBranch(ProviderConvertible<? extends CharSequence> mcVersion, Collection<String> allowedBranches) {
+        return this.getMCTagOffsetBranch(mcVersion.asProvider(), allowedBranches);
+    }
 
 
     /* INFO */

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

@@ -73,12 +73,15 @@ default String getMCTagOffsetBranch(@UnknownNullability String mcVersion) {
     }
 
     @Override
-    default String getMCTagOffsetBranch(String mcVersion, String... allowedBranches) {
+    default String getMCTagOffsetBranch(@UnknownNullability String mcVersion, String... allowedBranches) {
         return this.getMCTagOffsetBranch(mcVersion, Arrays.asList(allowedBranches));
     }
 
     @Override
-    default String getMCTagOffsetBranch(String mcVersion, Collection<String> allowedBranches) {
+    default String getMCTagOffsetBranch(@UnknownNullability String mcVersion, Collection<String> allowedBranches) {
+        if (mcVersion == null || mcVersion.isBlank())
+            return this.getTagOffsetBranch();
+
         return "%s-%s".formatted(mcVersion, this.getTagOffsetBranch(allowedBranches));
     }