Skip to content

Commit d586d66

Browse files
committed
Downgrade source/target compatibility to java 21
Remove all markdown javadocs to stay consistent
1 parent 7bcd0b5 commit d586d66

File tree

4 files changed

+61
-58
lines changed

4 files changed

+61
-58
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ test {
4141
}
4242

4343
java {
44-
sourceCompatibility = JavaVersion.VERSION_25
45-
targetCompatibility = JavaVersion.VERSION_25
44+
sourceCompatibility = JavaVersion.VERSION_21
45+
targetCompatibility = JavaVersion.VERSION_21
4646
withSourcesJar()
4747
withJavadocJar()
4848
}

src/main/java/com/minecrafttas/discombobulator/Discombobulator.java

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,50 +34,50 @@
3434
*/
3535
public class Discombobulator implements Plugin<Project> {
3636

37-
///
38-
/// Which port to lock
39-
///
37+
/**
38+
* Which port to lock
39+
*/
4040
public static int PORT_LOCK = 8762;
4141

42-
///
43-
/// The config set in the build.gradle file of the discombobulator
44-
///
42+
/**
43+
* The config set in the build.gradle file of the discombobulator
44+
*/
4545
public static PreprocessingConfiguration config;
4646

47-
///
48-
/// If true: Disables color output in the console
49-
///
47+
/**
48+
* If true: Disables color output in the console
49+
*/
5050
public static boolean DISABLE_ANSI = false;
5151

52-
///
53-
/// Whether to use Windows or Unix style line feeds
54-
///
52+
/**
53+
* Whether to use Windows or Unix style line feeds
54+
*/
5555
public static String DEFAULT_LINE_FEED = System.lineSeparator();
5656

57-
///
58-
/// The base dir of the project
59-
///
57+
/**
58+
* The base dir of the project
59+
*/
6060
public static Path BASE_PROJECT_DIR;
6161

62-
///
63-
/// The base build directory, usually {@link #BASE_PROJECT_DIR}/build
64-
///
62+
/**
63+
* The base build directory, usually {@link #BASE_PROJECT_DIR}/build
64+
*/
6565
public static Path BUILD_DIR;
6666

67-
///
68-
/// The {@link FilePreprocessor}
69-
///
67+
/**
68+
* The {@link FilePreprocessor}
69+
*/
7070
public static FilePreprocessor fileProcessor;
7171

72-
///
73-
/// The {@link PathLock}
74-
///
72+
/**
73+
* The {@link PathLock}
74+
*/
7575
public static PathLock pathLock;
7676

77-
///
78-
/// The version of Discombobulator,
79-
/// used for the splash in the console
80-
///
77+
/**
78+
* The version of Discombobulator,
79+
* used for the splash in the console
80+
*/
8181
private static String discoVersion;
8282

8383
/**
@@ -92,18 +92,18 @@ public void apply(Project project) {
9292

9393
// Register tasks
9494

95-
/// preprocessBase ///
95+
/* preprocessBase */
9696
TaskPreprocessBase baseTask = project.getTasks().register("preprocessBase", TaskPreprocessBase.class).get();
9797
baseTask.setGroup("discombobulator");
9898
baseTask.setDescription("Split base source into seperate version folders");
9999

100-
/// preprocessWatch ///
100+
/* preprocessWatch */
101101
TaskPreprocessWatch watchTask = project.getTasks().register("preprocessWatch", TaskPreprocessWatch.class).get();
102102
watchTask.setGroup("discombobulator");
103103
watchTask.setDescription("Starts a watch session. Preprocesses files into other versions on file change.");
104104
watchTask.setProperty("projectName", project.getName());
105105

106-
/// collectBuilds ///
106+
/* collectBuilds */
107107
TaskCollectBuilds collectBuilds = project.getTasks().register("collectBuilds", TaskCollectBuilds.class).get();
108108
collectBuilds.setGroup("discombobulator");
109109
collectBuilds.setDescription("Builds, then collects all versions in root/build");
@@ -119,7 +119,7 @@ public void apply(Project project) {
119119
collectBuilds.setDependsOn(compileTaskList);
120120
collectBuilds.setProperty("buildDirectories", buildDirs);
121121

122-
/// preprocessVersion ///
122+
/* preprocessVersion */
123123
for (Project subProject : project.getSubprojects()) {
124124
// Register preprocessVersion task in subProjects
125125
TaskPreprocessVersion versionTask = subProject.getTasks().register("preprocessVersion", TaskPreprocessVersion.class).get();

src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessWatch.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -264,22 +264,25 @@ public void close() {
264264
}
265265
}
266266

267-
/// Stores data used for preprocessing the file that was edited most recently.
268-
///
269-
/// This fixes an issue where the IDE will behave weirdly, when trying to
270-
/// preprocess and replace a file, that is currently being worked on. So when
271-
/// saving a file, The file watcher would also replace the file that you just
272-
/// saved, leading to discrepancies and annoyances.
273-
///
274-
/// With this, you can execute the preprocessing at a later time.
275-
///
276-
/// @author Scribble ///
267+
/**
268+
* Stores data used for preprocessing the file that was edited most recently.
269+
*
270+
* This fixes an issue where the IDE will behave weirdly, when trying to
271+
* preprocess and replace a file, that is currently being worked on. So when
272+
* saving a file, The file watcher would also replace the file that you just
273+
* saved, leading to discrepancies and annoyances.
274+
*
275+
* With this, you can execute the preprocessing at a later time.
276+
*
277+
* @author Scribble
278+
*/
277279
public static record CurrentFilePreprocessAction(List<String> outLines, Path inFile, Path outFile) {
278280
}
279281

280-
/// Runs the {@link CurrentFilePreprocessAction}
281-
///
282-
/// @param currentFileAction The {@link CurrentFilePreprocessAction} to run ///
282+
/**
283+
* Runs the {@link CurrentFilePreprocessAction}
284+
* @param currentFileAction The {@link CurrentFilePreprocessAction} to run
285+
*/
283286
public static void runFileAction(CurrentFilePreprocessAction currentFileAction) throws IOException {
284287
Path outFile = currentFileAction.outFile();
285288
List<String> outLines = currentFileAction.outLines();

src/main/java/com/minecrafttas/discombobulator/utils/LineFeedHelper.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
*/
1414
public class LineFeedHelper {
1515

16-
///
17-
/// Prints information about the current line feed character to the console.
18-
///
19-
/// Including whether Disco is using the default line seperator or not
20-
/// @throws Exception
21-
///
16+
/**
17+
* Prints information about the current line feed character to the console.
18+
* Including whether Disco is using the default line seperator or not
19+
*
20+
* @throws Exception
21+
*/
2222
public static void printMessage() throws Exception {
2323
LineFeedHelper.checkLineFeed(Discombobulator.DEFAULT_LINE_FEED);
2424
String property = System.getProperty("line.seperator");
@@ -32,11 +32,11 @@ public static void printMessage() throws Exception {
3232
}
3333
}
3434

35-
///
36-
/// Checks the line feed character
37-
/// @param lineFeed The {@link Discombobulator#DEFAULT_LINE_FEED}
38-
/// @throws Exception If the defaultLineFeed is not a line feed character
39-
///
35+
/**
36+
* Checks the line feed character
37+
* @param lineFeed The {@link Discombobulator#DEFAULT_LINE_FEED}
38+
* @throws Exception If the defaultLineFeed is not a line feed character
39+
*/
4040
public static void checkLineFeed(String lineFeed) throws Exception {
4141
if (!isLineFeed(lineFeed)) {
4242
throw new Exception("Property defaultLineFeed is neither \"\\r\\n\" nor \"\\n\"");

0 commit comments

Comments
 (0)