Update

Author: RealMangorage

build.gradle

@@ -45,12 +45,6 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'java'
 apply plugin: 'maven-publish'
 
-def getCommitNumber = {
-    def proc = 'git rev-list --count master'.execute()
-    proc.waitFor()
-    return proc.text.trim()
-}
-
 group = 'org.mangorage'
 version = getLatestGitTag() + "." + getLatestGitVersion()
 

src/main/java/org/mangorage/mangobotgradle/tasks/DatagenTask.java

@@ -22,13 +22,17 @@
 
 package org.mangorage.mangobotgradle.tasks;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.ResolvedDependency;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.mangorage.mangobotgradle.MangoBotGradlePlugin;
 import org.mangorage.mangobotgradle.core.resolvers.ResolveDependency;
 import org.mangorage.mangobotgradle.core.resolvers.Resolver;
+import org.mangorage.mangobotgradle.types.Dependencies;
+import org.mangorage.mangobotgradle.types.Dependency;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;
@@ -41,6 +45,8 @@
 import java.util.function.Predicate;
 
 public class DatagenTask {
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+
     private static final List<String> mavenRepositories = List.of(
             "https://repo.maven.apache.org/maven2/",
             "https://repo1.maven.org/maven2/"
@@ -89,7 +95,7 @@ public static ResolveDependency resolve(ResolveDependency preDep) {
     }
 
 
-    public static void getTransitiveDep(List<String> repos, ResolvedDependency dependency, Predicate<ModuleVersionIdentifier> checker, ArrayList<String> deps, ArrayList<ModuleVersionIdentifier> identifiers, ArrayList<String> urls) {
+    public static void getTransitiveDep(List<String> repos, ResolvedDependency dependency, Predicate<ModuleVersionIdentifier> checker, ArrayList<String> deps, ArrayList<ModuleVersionIdentifier> identifiers, ArrayList<Dependency> urls) {
         var dep = dependency.getModule().getId();
         String id = dep.toString();
 
@@ -108,7 +114,15 @@ public static void getTransitiveDep(List<String> repos, ResolvedDependency depen
             var result = generate(repos, path);
 
             if (result != null) {
-                urls.add("%s %s %s %s %s-%s.jar".formatted(result, resolved.groupID(), resolved.nameID(), resolved.versionID(), resolved.nameID2(), resolved.versionID2()));
+                urls.add(
+                        new Dependency(
+                                result,
+                                resolved.groupID(),
+                                resolved.nameID(),
+                                resolved.versionID(),
+                                "%s-%s.jar".formatted(resolved.nameID2(), resolved.versionID2())
+                        )
+                );
             }
         }
 
@@ -143,7 +157,7 @@ public static void apply(Project project, MangoBotGradlePlugin gradleUtilsPlugin
                 var repos = getAllRepositories(project);
                 var deps = new ArrayList<String>();
                 var idents = new ArrayList<ModuleVersionIdentifier>();
-                var urls = new ArrayList<String>();
+                var urls = new ArrayList<Dependency>();
 
                 var conf = project.getConfigurations().getByName("library");
 
@@ -156,7 +170,7 @@ public static void apply(Project project, MangoBotGradlePlugin gradleUtilsPlugin
                 System.out.printf("%s dependencies%n", deps.size());
 
                 var projectRootDir = project.getProjectDir().toPath();
-                var depsFile = projectRootDir.resolve("src/main/resources/installerdata/deps.txt").toFile();
+                var depsFile = projectRootDir.resolve("src/main/resources/installer-data/dependencies.txt").toFile();
 
 
                 try {
@@ -167,13 +181,7 @@ public static void apply(Project project, MangoBotGradlePlugin gradleUtilsPlugin
                 }
 
                 try (BufferedWriter writer = new BufferedWriter(new FileWriter(depsFile))) {
-                    urls.forEach(a -> {
-                        try {
-                            writer.write(a + "\n");
-                        } catch (IOException e) {
-                            throw new RuntimeException(e);
-                        }
-                    });
+                    writer.write(GSON.toJson(new Dependencies(urls)));
                     writer.close();
                     System.out.println("Dependencies have been generated to: " + depsFile);
                 } catch (IOException e) {

src/main/java/org/mangorage/mangobotgradle/types/Dependencies.java

@@ -0,0 +1,6 @@
+package org.mangorage.mangobotgradle.types;
+
+
+import java.util.List;
+
+public record Dependencies(List<Dependency> dependencies) {}

src/main/java/org/mangorage/mangobotgradle/types/Dependency.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2023. MangoRage
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ * OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.mangorage.mangobotgradle.types;
+
+public record Dependency(String url, String group, String artifact, String version, String target) {}