From 5f69339e21e9ffc0751a867d77ca3d01e9b5f177 Mon Sep 17 00:00:00 2001 From: Matteo Hausner Date: Thu, 4 Apr 2024 20:13:35 +0200 Subject: [PATCH] Switched back to Eclipse JDT formatter --- .idea/eclipseCodeFormatter.xml | 14 + .idea/palantir-java-format.xml | 6 - build.gradle | 4 +- spotless.eclipseformat.xml | 1072 ++++++++++++++++++++++++++++++++ spotless.importorder | 1 + 5 files changed, 1089 insertions(+), 8 deletions(-) create mode 100644 .idea/eclipseCodeFormatter.xml delete mode 100644 .idea/palantir-java-format.xml create mode 100644 spotless.eclipseformat.xml create mode 100644 spotless.importorder diff --git a/.idea/eclipseCodeFormatter.xml b/.idea/eclipseCodeFormatter.xml new file mode 100644 index 00000000..e4fcf4f2 --- /dev/null +++ b/.idea/eclipseCodeFormatter.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/.idea/palantir-java-format.xml b/.idea/palantir-java-format.xml deleted file mode 100644 index 38157184..00000000 --- a/.idea/palantir-java-format.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0baf1e07..57d70b58 100644 --- a/build.gradle +++ b/build.gradle @@ -229,13 +229,13 @@ spotless { java { target 'src/main/java/de/bwravencl/**/*.java' targetExclude moduleInfoFile, metadataFile - palantirJavaFormat '2.41.0' + eclipse('4.27').configFile 'spotless.eclipseformat.xml' formatAnnotations() cleanthat().sourceCompatibility(project.sourceCompatibility.toString()).addMutators([ 'SafeButNotConsensual', 'SafeButControversial' ]) - importOrder() + importOrderFile 'spotless.importorder' removeUnusedImports() licenseHeader '''\ /* Copyright (C) $YEAR Matteo Hausner diff --git a/spotless.eclipseformat.xml b/spotless.eclipseformat.xml new file mode 100644 index 00000000..76af905e --- /dev/null +++ b/spotless.eclipseformat.xml @@ -0,0 +1,1072 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spotless.importorder b/spotless.importorder new file mode 100644 index 00000000..45bbeba5 --- /dev/null +++ b/spotless.importorder @@ -0,0 +1 @@ +0=