[6.0] Version catalog version support (re-try) (#980)

This reapplies commit 0b1f02a.

`GString` and other subclasses of `CharSequence` exists. The solution is
to run `Object#toString` on the resultant value rather than casting
it to a string. This is the same behavior as before, the only difference is
that the enforcement on `CharSequence` is removed.

Author: Jonathing

src/common/java/net/minecraftforge/gradle/common/util/MinecraftExtension.java

@@ -16,6 +16,8 @@
 import groovy.lang.Closure;
 import groovy.lang.GroovyObjectSupport;
 import groovy.lang.MissingPropertyException;
+import org.gradle.api.provider.ProviderConvertible;
+
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -85,15 +87,33 @@ public void mappings(String channel, String version) {
         getMappingVersion().set(version);
     }
 
-    public void mappings(Map<String, ? extends CharSequence> mappings) {
-        CharSequence channel = mappings.get("channel");
-        CharSequence version = mappings.get("version");
+    public void mappings(Object channel, Object version) {
+        setMappingProperty(getMappingChannel(), channel);
+        setMappingProperty(getMappingVersion(), version);
+    }
+
+    public void mappings(Map<String, ?> mappings) {
+        Object channel = mappings.get("channel");
+        Object version = mappings.get("version");
 
         if (channel == null || version == null) {
             throw new IllegalArgumentException("Must specify both mappings channel and version");
         }
 
-        mappings(channel.toString(), version.toString());
+        mappings(channel, version);
+    }
+
+    // Using Object#toString on the value will account for weird cases of GString and non-String CharSequences
+    private void setMappingProperty(Property<String> property, Object value) {
+        Provider<?> provider;
+        if (value instanceof ProviderConvertible<?>)
+            provider = ((ProviderConvertible<?>) value).asProvider();
+        else if (value instanceof Provider<?>)
+            provider = (Provider<?>) value;
+        else
+            provider = project.provider(() -> value);
+
+        property.set(provider.map(Object::toString));
     }
 
     public ConfigurableFileCollection getAccessTransformers() {

src/userdev/java/net/minecraftforge/gradle/userdev/jarjar/JarJarProjectExtension.java

@@ -18,6 +18,8 @@
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.*;
 import org.gradle.api.attributes.Attribute;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.provider.ProviderConvertible;
 import org.gradle.api.publish.maven.MavenPublication;
 
 import java.util.List;
@@ -78,6 +80,14 @@ public void fromRuntimeConfiguration() {
         project.getTasks().withType(JarJar.class).configureEach(JarJar::fromRuntimeConfiguration);
     }
 
+    public void pin(Dependency dependency, ProviderConvertible<String> version) {
+        pin(dependency, version.asProvider());
+    }
+
+    public void pin(Dependency dependency, Provider<String> version) {
+        pin(dependency, version.get());
+    }
+
     public void pin(Dependency dependency, String version) {
         enable();
         if (dependency instanceof ModuleDependency) {
@@ -94,6 +104,14 @@ public Optional<String> getPin(Dependency dependency) {
         return Optional.empty();
     }
 
+    public void ranged(Dependency dependency, ProviderConvertible<String> version) {
+        ranged(dependency, version.asProvider());
+    }
+
+    public void ranged(Dependency dependency, Provider<String> version) {
+        ranged(dependency, version.get());
+    }
+
     public void ranged(Dependency dependency, String range) {
         enable();
         if (dependency instanceof ModuleDependency) {