use DependencyFactory for mc deps

Author: TropheusJ

plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/extension/dep/MinecraftDepsExtension.java

@@ -3,41 +3,41 @@
 import io.github.cichlidmc.cichlid_gradle.util.Distribution;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.dsl.DependencyHandler;
+import org.gradle.api.artifacts.ExternalModuleDependency;
+import org.gradle.api.artifacts.dsl.DependencyFactory;
 
 public class MinecraftDepsExtension {
 	// can't use managed properties - https://github.com/gradle/gradle/issues/18213
-	private final DependencyHandler deps;
+	private final DependencyFactory factory;
 
-    private MinecraftDepsExtension(DependencyHandler deps) {
-        this.deps = deps;
+    private MinecraftDepsExtension(DependencyFactory factory) {
+        this.factory = factory;
     }
 
-    public Dependency client(String version) {
+    public ExternalModuleDependency client(String version) {
 		return this.ofDist(Distribution.CLIENT, version);
 	}
 
-	public Dependency server(String version) {
+	public ExternalModuleDependency server(String version) {
 		return this.ofDist(Distribution.SERVER, version);
 	}
 
-	public Dependency merged(String version) {
+	public ExternalModuleDependency merged(String version) {
 		return this.ofDist(Distribution.MERGED, version);
 	}
 
-	public Dependency of(Action<MinecraftSpec> action) {
+	public ExternalModuleDependency of(Action<MinecraftSpec> action) {
 		MinecraftSpecImpl spec = new MinecraftSpecImpl();
 		action.execute(spec);
-		return this.deps.create(spec.toDependencyString());
+		return spec.createDependencyOrThrow(this.factory);
 	}
 
-	private Dependency ofDist(Distribution dist, String version) {
+	private ExternalModuleDependency ofDist(Distribution dist, String version) {
 		return this.of(spec -> spec.distribution(dist).version(version));
 	}
 
 	public static void setup(Project project) {
-		MinecraftDepsExtension mc = new MinecraftDepsExtension(project.getDependencies());
+		MinecraftDepsExtension mc = new MinecraftDepsExtension(project.getDependencyFactory());
 		project.getDependencies().getExtensions().add("minecraft", mc);
 	}
 }

plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/extension/dep/MinecraftSpecImpl.java

@@ -2,6 +2,8 @@
 
 import io.github.cichlidmc.cichlid_gradle.util.Distribution;
 import org.gradle.api.InvalidUserDataException;
+import org.gradle.api.artifacts.ExternalModuleDependency;
+import org.gradle.api.artifacts.dsl.DependencyFactory;
 
 public final class MinecraftSpecImpl implements MinecraftSpec {
 	private Distribution dist;
@@ -19,14 +21,14 @@ public MinecraftSpec version(String version) {
 		return this;
 	}
 
-	public String toDependencyString() {
+	public ExternalModuleDependency createDependencyOrThrow(DependencyFactory factory) {
 		if (this.dist == null) {
 			throw new InvalidUserDataException("Minecraft distribution is not specified.");
 		} else if (this.version == null) {
 			throw new InvalidUserDataException("Minecraft version is not specified.");
 		}
 
-		return "net.minecraft:minecraft-" + this.dist.name + ':' + this.version;
+		return factory.create("net.minecraft", "minecraft-" + this.dist.name, this.version);
 	}
 
 	@Override