From f78afabe95651032bebaf4bc01d73f9ceb9d0c33 Mon Sep 17 00:00:00 2001 From: Justus Garbe Date: Fri, 15 Dec 2023 22:55:27 +0100 Subject: [PATCH] misc: remove spotless --- build.gradle | 19 - formatter.xml | 399 ------------------ .../me/darknet/assembler/ast/ASTElement.java | 4 +- 3 files changed, 1 insertion(+), 421 deletions(-) delete mode 100644 formatter.xml diff --git a/build.gradle b/build.gradle index 23d926a8..57073542 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,3 @@ -plugins { - id "com.diffplug.spotless" version "6.14.0" -} - allprojects { group 'me.darknet' version '2.3.0' @@ -9,7 +5,6 @@ allprojects { subprojects { apply plugin: 'java-library' - apply plugin: 'com.diffplug.spotless' compileJava.options.encoding = "UTF-8" compileJava.options.incremental = true @@ -32,20 +27,6 @@ subprojects { withSourcesJar() } - spotless { - java { - def rootDir = rootProject.projectDir.toPath() - - importOrder("me.darknet", "", "\\#", "java|javax") - removeUnusedImports() - - eclipse().configFile(rootDir.resolve("formatter.xml").toString()) - - trimTrailingWhitespace() - - } - } - test { useJUnitPlatform() diff --git a/formatter.xml b/formatter.xml deleted file mode 100644 index 343a76fa..00000000 --- a/formatter.xml +++ /dev/null @@ -1,399 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jasm-core/src/main/java/me/darknet/assembler/ast/ASTElement.java b/jasm-core/src/main/java/me/darknet/assembler/ast/ASTElement.java index 1807168d..9f5106c0 100644 --- a/jasm-core/src/main/java/me/darknet/assembler/ast/ASTElement.java +++ b/jasm-core/src/main/java/me/darknet/assembler/ast/ASTElement.java @@ -34,9 +34,7 @@ public ASTElement(ElementType type, ASTElement... children) { } public ASTElement(ElementType type, @NotNull List children) { - this.children = children.stream() - .filter(Objects::nonNull) - .sorted(SORT_POS) + this.children = children.stream().filter(Objects::nonNull).sorted(SORT_POS) .collect(Collectors.toCollection(ArrayList::new)); for (ASTElement child : this.children) { child.parent = this;