Skip to content

Commit 1db096f

Browse files
committed
Cleaned up stuff
Removed un-used bits, that dont belong here.
1 parent 9169a9c commit 1db096f

10 files changed

Lines changed: 37 additions & 285 deletions

File tree

build.gradle

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
buildscript {
2424
repositories {
25-
mavenLocal()
2625
mavenCentral()
2726

2827
maven {
@@ -48,6 +47,8 @@ apply plugin: 'maven-publish'
4847
group = 'org.mangorage'
4948
version = getLatestGitTag() + "." + getLatestGitVersion()
5049

50+
println("Version -> " + version)
51+
5152
def getLatestGitTag() {
5253
def result = "git describe --long --tags".execute().text.trim()
5354
if (result.empty) {
@@ -90,11 +91,9 @@ dependencies {
9091
compileOnly 'org.apache.groovy:groovy:4.0.14'
9192
compileOnly gradleApi()
9293

93-
compileOnly 'org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r'
94-
compileOnly 'com.mattmalec:Pterodactyl4J:2.BETA_140'
9594
compileOnly 'com.google.code.gson:gson:2.10.1'
95+
compileOnly 'org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r'
9696

97-
shadow 'com.mattmalec:Pterodactyl4J:2.BETA_140'
9897
shadow 'com.google.code.gson:gson:2.10.1'
9998
shadow 'org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r'
10099
}
@@ -120,10 +119,21 @@ jar {
120119
}
121120
}
122121

122+
task sourcesJar(type: Jar, dependsOn: classes) {
123+
setArchiveClassifier('sources')
124+
from sourceSets.main.allSource
125+
}
126+
127+
task javadocJar(type: Jar, dependsOn: javadoc) {
128+
archiveClassifier.set('javadoc')
129+
from javadoc.destinationDir
130+
}
123131

124132
publishing {
125133
publications.register("gradleutils", MavenPublication) {
126134
artifact jar
135+
artifact sourcesJar
136+
artifact javadocJar
127137

128138
pom {
129139
name = 'MangoBot GradleUtils'
@@ -139,6 +149,15 @@ publishing {
139149
name = 'MangoRage'
140150
}
141151
}
152+
withXml {
153+
def dependencies = asNode().appendNode('dependencies')
154+
configurations.library.getDependencies().each {
155+
def dependency = dependencies.appendNode('dependency')
156+
dependency.appendNode('groupId', it.group)
157+
dependency.appendNode('artifactId', it.name)
158+
dependency.appendNode('version', it.version)
159+
}
160+
}
142161
}
143162
}
144163

src/main/java/org/mangorage/mangobotgradle/Config.java

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,17 @@
2424

2525
import org.gradle.api.Task;
2626
import org.gradle.jvm.tasks.Jar;
27-
import org.mangorage.mangobotgradle.core.Constants;
2827
import org.mangorage.mangobotgradle.core.resolvers.Resolver;
2928
import org.mangorage.mangobotgradle.tasks.DatagenTask;
30-
import org.mangorage.mangobotgradle.tasks.RestartServerTask;
3129

3230
import java.util.function.Supplier;
3331

3432
public class Config {
35-
private final MangoBotGradlePlugin plugin;
3633
private boolean pluginDevMode = true;
3734
private Jar jarTask;
3835
private Supplier<Task> releaseTask = () -> null;
3936

40-
public Config(MangoBotGradlePlugin plugin) {
41-
this.plugin = plugin;
42-
}
43-
44-
public void enableRestartServerTask(String serverID, String serverURL, String serverToken, Task dependency) {
45-
plugin.getTaskRegistry().register(tasks -> {
46-
var clazz = dependency == null ? RestartServerTask.WithoutDep.class : RestartServerTask.class;
47-
if (dependency == null)
48-
tasks.register("restartServer", clazz, serverID, serverURL, serverToken, Constants.BOT_TASKS_GROUP);
49-
if (dependency != null)
50-
tasks.register("restartServer", clazz, serverID, serverURL, serverToken, Constants.BOT_TASKS_GROUP, dependency);
51-
});
52-
}
37+
public Config() {}
5338

5439
public void setJarTask(Jar jar) {
5540
this.jarTask = jar;
@@ -59,7 +44,6 @@ public Jar getJarTask() {
5944
return jarTask;
6045
}
6146

62-
6347
public void disableCopyOverBot() {
6448
this.pluginDevMode = false;
6549
}
@@ -68,14 +52,6 @@ public boolean isPluginDevMode() {
6852
return this.pluginDevMode;
6953
}
7054

71-
public void setReleaseTask(Supplier<Task> task) {
72-
this.releaseTask = task;
73-
}
74-
75-
public Task getReleaseTask() {
76-
return releaseTask.get();
77-
}
78-
7955
public void addResolver(Resolver resolver) {
8056
DatagenTask.add(resolver);
8157
}

src/main/java/org/mangorage/mangobotgradle/MangoBotGradlePlugin.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626
import org.gradle.api.Project;
2727
import org.mangorage.mangobotgradle.core.Constants;
2828
import org.mangorage.mangobotgradle.core.TaskRegistry;
29-
import org.mangorage.mangobotgradle.core.Version;
3029
import org.mangorage.mangobotgradle.tasks.CopyTask;
3130
import org.mangorage.mangobotgradle.tasks.DatagenTask;
32-
import org.mangorage.mangobotgradle.tasks.ReleaseTask;
3331
import org.mangorage.mangobotgradle.tasks.RunBotTask;
3432
import org.mangorage.mangobotgradle.tasks.RunInstallerTask;
3533
import org.mangorage.mangobotgradle.tasks.SetupPluginsTask;
@@ -38,7 +36,7 @@
3836
import java.util.Objects;
3937

4038
public class MangoBotGradlePlugin implements Plugin<Project> {
41-
private final Config config = new Config(this);
39+
private final Config config = new Config();
4240
private final TaskRegistry taskRegistry = new TaskRegistry(config);
4341

4442
public TaskRegistry getTaskRegistry() {
@@ -56,15 +54,8 @@ public MangoBotGradlePlugin() {
5654

5755
t.register("runInstaller", RunInstallerTask.class, Constants.INSTALLER_TASKS_GROUP);
5856

59-
6057
t.register("runBot", RunBotTask.class, config, Constants.BOT_TASKS_GROUP);
6158
t.register("runDevBot", RunBotTask.class, config, Constants.BOT_TASKS_GROUP, List.of("--dev"));
62-
63-
if (config.getReleaseTask() != null) {
64-
t.register("releaseMajor", ReleaseTask.class, config, Constants.BOT_TASKS_GROUP, Version.Type.MAJOR);
65-
t.register("releaseMinor", ReleaseTask.class, config, Constants.BOT_TASKS_GROUP, Version.Type.MINOR);
66-
t.register("releasePatch", ReleaseTask.class, config, Constants.BOT_TASKS_GROUP, Version.Type.PATCH);
67-
}
6859
});
6960
}
7061

@@ -98,11 +89,11 @@ public void apply(Project project) {
9889
t.setCanBeResolved(true);
9990
});
10091

101-
var embededLibrary = project.getConfigurations().create("embedLibrary", t -> {
92+
var embeddedLibrary = project.getConfigurations().create("embedLibrary", t -> {
10293
t.setVisible(true);
10394
});
10495

105-
project.getConfigurations().findByName("implementation").extendsFrom(botCfg, plugin, library, embededLibrary);
96+
project.getConfigurations().findByName("implementation").extendsFrom(botCfg, plugin, library, embeddedLibrary);
10697

10798
project.afterEvaluate(a -> {
10899
Objects.requireNonNull(config.getJarTask(), "jarTask cannot be null!");

src/main/java/org/mangorage/mangobotgradle/core/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
package org.mangorage.mangobotgradle.core;
2424

25-
public class Constants {
25+
public final class Constants {
2626
public static final String BOT_TASKS_GROUP = "bot tasks";
2727
public static final String INSTALLER_TASKS_GROUP = "installer tasks";
2828
}

src/main/java/org/mangorage/mangobotgradle/core/TaskRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import java.util.ArrayList;
2929

30-
public class TaskRegistry {
30+
public final class TaskRegistry {
3131
private final Config config;
3232
private final ArrayList<IRegisterSupplier> registerSuppliers = new ArrayList<>();
3333

src/main/java/org/mangorage/mangobotgradle/core/Version.java

Lines changed: 0 additions & 108 deletions
This file was deleted.

src/main/java/org/mangorage/mangobotgradle/core/resolvers/CompletedResolver.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@
2222

2323
package org.mangorage.mangobotgradle.core.resolvers;
2424

25-
public record CompletedResolver(boolean success, ResolveDependency dependency) {
26-
}
25+
public record CompletedResolver(boolean success, ResolveDependency dependency) { }

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@
4444
import java.util.List;
4545
import java.util.function.Predicate;
4646

47-
public class DatagenTask {
47+
/**
48+
* Only Hardcoded class
49+
*
50+
* TODO: Fix it, so it isn't a final class,
51+
* TODO: should be abstract as per Gradle Task Conventions
52+
*/
53+
public final class DatagenTask {
4854
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
4955

5056
private static final List<String> mavenRepositories = List.of(

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

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)