From dd64062fba7a55721cbbfa621d88029749c2851b Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 23 Oct 2019 01:22:24 +0200 Subject: [PATCH] Compile to Java 8 using Jabel Currently, the server runs on Java 8 and some plugins, notably Terrain Control depend on a version-specific hack. Now, we do want to drop TC anyway to upgrade to 1.14.4 but there's also the goal of sharing this plugin for others, who likely run Java 8. It took me a while to figure out how to make it work with Lombok - have to use the right order. --- .idea/compiler.xml | 29 +++++++-- ...google_code_findbugs_annotations_2_0_1.xml | 13 ---- ...Maven__com_google_code_gson_gson_2_8_0.xml | 13 ---- .../Maven__com_google_guava_guava_15_0.xml | 13 ---- .../Maven__com_google_guava_guava_21_0.xml | 13 ---- ...oglecode_json_simple_json_simple_1_1_1.xml | 13 ---- .../Maven__commons_io_commons_io_2_6.xml | 13 ---- .../Maven__commons_lang_commons_lang_2_6.xml | 13 ---- .idea/libraries/Maven__junit_junit_3_8_1.xml | 13 ---- ...net_md_5_bungeecord_chat_1_12_SNAPSHOT.xml | 13 ---- ...org_bukkit_bukkit_1_13_1_R0_1_SNAPSHOT.xml | 13 ---- ...ven__org_javassist_javassist_3_20_0_GA.xml | 13 ---- ...en__org_reflections_reflections_0_9_10.xml | 13 ---- ...igotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml | 13 ---- .../Maven__org_yaml_snakeyaml_1_19.xml | 13 ---- BuildConfigUpdater/BuildConfigUpdater.iml | 9 ++- ButtonCore/pom.xml | 7 --- ButtonProcessor/ButtonProcessor.iml | 9 ++- pom.xml | 60 ++++++++++++++++++- 19 files changed, 98 insertions(+), 198 deletions(-) delete mode 100755 .idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml delete mode 100644 .idea/libraries/Maven__com_google_code_gson_gson_2_8_0.xml delete mode 100755 .idea/libraries/Maven__com_google_guava_guava_15_0.xml delete mode 100644 .idea/libraries/Maven__com_google_guava_guava_21_0.xml delete mode 100755 .idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml delete mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_6.xml delete mode 100755 .idea/libraries/Maven__commons_lang_commons_lang_2_6.xml delete mode 100755 .idea/libraries/Maven__junit_junit_3_8_1.xml delete mode 100644 .idea/libraries/Maven__net_md_5_bungeecord_chat_1_12_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__org_bukkit_bukkit_1_13_1_R0_1_SNAPSHOT.xml delete mode 100755 .idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml delete mode 100755 .idea/libraries/Maven__org_reflections_reflections_0_9_10.xml delete mode 100644 .idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 2317a4e..0de1f8c 100755 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -3,26 +3,45 @@ - + + + + + + + + + + + + + + + + + + - + - - + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml b/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml deleted file mode 100755 index a3d1316..0000000 --- a/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_0.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_0.xml deleted file mode 100644 index 6e5d5b7..0000000 --- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_15_0.xml b/.idea/libraries/Maven__com_google_guava_guava_15_0.xml deleted file mode 100755 index 8ae2de1..0000000 --- a/.idea/libraries/Maven__com_google_guava_guava_15_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_21_0.xml b/.idea/libraries/Maven__com_google_guava_guava_21_0.xml deleted file mode 100644 index a923456..0000000 --- a/.idea/libraries/Maven__com_google_guava_guava_21_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml deleted file mode 100755 index f3f3738..0000000 --- a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml b/.idea/libraries/Maven__commons_io_commons_io_2_6.xml deleted file mode 100644 index d722698..0000000 --- a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml deleted file mode 100755 index 2ec8376..0000000 --- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_3_8_1.xml b/.idea/libraries/Maven__junit_junit_3_8_1.xml deleted file mode 100755 index 71b2993..0000000 --- a/.idea/libraries/Maven__junit_junit_3_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_md_5_bungeecord_chat_1_12_SNAPSHOT.xml b/.idea/libraries/Maven__net_md_5_bungeecord_chat_1_12_SNAPSHOT.xml deleted file mode 100644 index a472890..0000000 --- a/.idea/libraries/Maven__net_md_5_bungeecord_chat_1_12_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bukkit_bukkit_1_13_1_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_bukkit_bukkit_1_13_1_R0_1_SNAPSHOT.xml deleted file mode 100644 index 63108e8..0000000 --- a/.idea/libraries/Maven__org_bukkit_bukkit_1_13_1_R0_1_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml deleted file mode 100755 index c21c9b0..0000000 --- a/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reflections_reflections_0_9_10.xml b/.idea/libraries/Maven__org_reflections_reflections_0_9_10.xml deleted file mode 100755 index d92ca0d..0000000 --- a/.idea/libraries/Maven__org_reflections_reflections_0_9_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml deleted file mode 100644 index b6f88ae..0000000 --- a/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml deleted file mode 100644 index 33ccf19..0000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml index 567e232..8be4539 100644 --- a/BuildConfigUpdater/BuildConfigUpdater.iml +++ b/BuildConfigUpdater/BuildConfigUpdater.iml @@ -1,12 +1,18 @@ - + + + + + + + @@ -29,5 +35,6 @@ + \ No newline at end of file diff --git a/ButtonCore/pom.xml b/ButtonCore/pom.xml index 23d0e4b..752e64d 100755 --- a/ButtonCore/pom.xml +++ b/ButtonCore/pom.xml @@ -152,13 +152,6 @@ mockito-core 3.0.0 - - - org.projectlombok - lombok - 1.18.8 - provided - com.github.TBMCPlugins.ButtonCore ButtonProcessor diff --git a/ButtonProcessor/ButtonProcessor.iml b/ButtonProcessor/ButtonProcessor.iml index 30c9f05..d373248 100755 --- a/ButtonProcessor/ButtonProcessor.iml +++ b/ButtonProcessor/ButtonProcessor.iml @@ -1,13 +1,19 @@ - + + + + + + + @@ -20,5 +26,6 @@ + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3ed6cd8..422fc03 100755 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,9 @@ ButtonCore pom master-SNAPSHOT + + 1.18.10 + ButtonCore Parent @@ -24,8 +27,29 @@ maven-compiler-plugin 3.8.1 - 10 - 10 + 8 + + + com.github.bsideup.jabel + jabel-javac-plugin + 0.2.0 + + + org.projectlombok + lombok + ${lombok.version} + + + com.github.TBMCPlugins.ButtonCore + ButtonProcessor + master-SNAPSHOT + + + + com.github.bsideup.jabel.JabelJavacProcessor + lombok.launch.AnnotationProcessorHider$AnnotationProcessor + buttondevteam.buttonproc.ButtonProcessor + @@ -45,5 +69,37 @@ 3.8.1 test + + + org.projectlombok + lombok + ${lombok.version} + provided + + + + + intellij-idea-only + + + idea.maven.embedder.version + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 13 + + --enable-preview + + + + + + + \ No newline at end of file