From 5399eec87d513cc62e43589d962a8b8c1b95b33e Mon Sep 17 00:00:00 2001 From: Lixfel Date: Wed, 15 Jun 2022 18:00:06 +0200 Subject: [PATCH] Test gradle reduction Signed-off-by: Lixfel --- FightSystem_10/build.gradle | 1 - FightSystem_10/settings.gradle | 20 -------------------- FightSystem_12/build.gradle | 1 - FightSystem_12/settings.gradle | 20 -------------------- FightSystem_14/build.gradle | 1 - FightSystem_14/settings.gradle | 20 -------------------- FightSystem_15/build.gradle | 1 - FightSystem_15/settings.gradle | 20 -------------------- FightSystem_18/build.gradle | 1 - FightSystem_18/settings.gradle | 20 -------------------- FightSystem_19/build.gradle | 1 - FightSystem_19/settings.gradle | 20 -------------------- FightSystem_8/build.gradle | 1 - FightSystem_8/settings.gradle | 20 -------------------- FightSystem_9/build.gradle | 1 - FightSystem_9/settings.gradle | 20 -------------------- FightSystem_Core/build.gradle | 1 - FightSystem_Core/settings.gradle | 20 -------------------- FightSystem_Standalone/build.gradle | 3 --- FightSystem_Standalone/settings.gradle | 20 -------------------- build.gradle | 7 +++---- 21 files changed, 3 insertions(+), 216 deletions(-) delete mode 100644 FightSystem_10/settings.gradle delete mode 100644 FightSystem_12/settings.gradle delete mode 100644 FightSystem_14/settings.gradle delete mode 100644 FightSystem_15/settings.gradle delete mode 100644 FightSystem_18/settings.gradle delete mode 100644 FightSystem_19/settings.gradle delete mode 100644 FightSystem_8/settings.gradle delete mode 100644 FightSystem_9/settings.gradle delete mode 100644 FightSystem_Core/settings.gradle delete mode 100644 FightSystem_Standalone/settings.gradle diff --git a/FightSystem_10/build.gradle b/FightSystem_10/build.gradle index 0c18280..5cfebcc 100644 --- a/FightSystem_10/build.gradle +++ b/FightSystem_10/build.gradle @@ -18,7 +18,6 @@ */ plugins { - id 'base' id 'java' } diff --git a/FightSystem_10/settings.gradle b/FightSystem_10/settings.gradle deleted file mode 100644 index d46d597..0000000 --- a/FightSystem_10/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_10' \ No newline at end of file diff --git a/FightSystem_12/build.gradle b/FightSystem_12/build.gradle index e869579..bbe1745 100644 --- a/FightSystem_12/build.gradle +++ b/FightSystem_12/build.gradle @@ -18,7 +18,6 @@ */ plugins { - id 'base' id 'java' } diff --git a/FightSystem_12/settings.gradle b/FightSystem_12/settings.gradle deleted file mode 100644 index 9dc37ba..0000000 --- a/FightSystem_12/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_12' \ No newline at end of file diff --git a/FightSystem_14/build.gradle b/FightSystem_14/build.gradle index 2e6b025..5312c3a 100644 --- a/FightSystem_14/build.gradle +++ b/FightSystem_14/build.gradle @@ -18,7 +18,6 @@ */ plugins { - id 'base' id 'java' } diff --git a/FightSystem_14/settings.gradle b/FightSystem_14/settings.gradle deleted file mode 100644 index b24db67..0000000 --- a/FightSystem_14/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_14' \ No newline at end of file diff --git a/FightSystem_15/build.gradle b/FightSystem_15/build.gradle index 972e8fd..dacb6a5 100644 --- a/FightSystem_15/build.gradle +++ b/FightSystem_15/build.gradle @@ -18,7 +18,6 @@ */ plugins { - id 'base' id 'java' } diff --git a/FightSystem_15/settings.gradle b/FightSystem_15/settings.gradle deleted file mode 100644 index a14aec6..0000000 --- a/FightSystem_15/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_15' \ No newline at end of file diff --git a/FightSystem_18/build.gradle b/FightSystem_18/build.gradle index 82f50eb..845a8fb 100644 --- a/FightSystem_18/build.gradle +++ b/FightSystem_18/build.gradle @@ -18,7 +18,6 @@ */ plugins { - id 'base' id 'java' } diff --git a/FightSystem_18/settings.gradle b/FightSystem_18/settings.gradle deleted file mode 100644 index 5ef8f90..0000000 --- a/FightSystem_18/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_18' \ No newline at end of file diff --git a/FightSystem_19/build.gradle b/FightSystem_19/build.gradle index 2c83e11..3a4d5c8 100644 --- a/FightSystem_19/build.gradle +++ b/FightSystem_19/build.gradle @@ -18,7 +18,6 @@ */ plugins { - id 'base' id 'java' } diff --git a/FightSystem_19/settings.gradle b/FightSystem_19/settings.gradle deleted file mode 100644 index b2b36d4..0000000 --- a/FightSystem_19/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_19' \ No newline at end of file diff --git a/FightSystem_8/build.gradle b/FightSystem_8/build.gradle index 2f06c10..0b9c426 100644 --- a/FightSystem_8/build.gradle +++ b/FightSystem_8/build.gradle @@ -18,7 +18,6 @@ */ plugins { - id 'base' id 'java' } diff --git a/FightSystem_8/settings.gradle b/FightSystem_8/settings.gradle deleted file mode 100644 index dabf160..0000000 --- a/FightSystem_8/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_8' \ No newline at end of file diff --git a/FightSystem_9/build.gradle b/FightSystem_9/build.gradle index 1dc5f75..d9054a5 100644 --- a/FightSystem_9/build.gradle +++ b/FightSystem_9/build.gradle @@ -18,7 +18,6 @@ */ plugins { - id 'base' id 'java' } diff --git a/FightSystem_9/settings.gradle b/FightSystem_9/settings.gradle deleted file mode 100644 index 8955f99..0000000 --- a/FightSystem_9/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_9' \ No newline at end of file diff --git a/FightSystem_Core/build.gradle b/FightSystem_Core/build.gradle index 1062acd..41d367d 100644 --- a/FightSystem_Core/build.gradle +++ b/FightSystem_Core/build.gradle @@ -18,7 +18,6 @@ */ plugins { - id 'base' id 'java' } diff --git a/FightSystem_Core/settings.gradle b/FightSystem_Core/settings.gradle deleted file mode 100644 index 2f5cfea..0000000 --- a/FightSystem_Core/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_Core' \ No newline at end of file diff --git a/FightSystem_Standalone/build.gradle b/FightSystem_Standalone/build.gradle index cb726f5..02c6487 100644 --- a/FightSystem_Standalone/build.gradle +++ b/FightSystem_Standalone/build.gradle @@ -1,5 +1,3 @@ -import org.apache.tools.ant.taskdefs.condition.Os - /* * This file is a part of the SteamWar software. * @@ -20,7 +18,6 @@ import org.apache.tools.ant.taskdefs.condition.Os */ plugins { - id 'base' id 'java' id 'com.github.johnrengelman.shadow' diff --git a/FightSystem_Standalone/settings.gradle b/FightSystem_Standalone/settings.gradle deleted file mode 100644 index 938a70b..0000000 --- a/FightSystem_Standalone/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'FightSystem_Standalonw' \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0486232..be1e8d7 100644 --- a/build.gradle +++ b/build.gradle @@ -18,9 +18,8 @@ */ -import org.apache.tools.ant.taskdefs.condition.Os -import java.util.function.BiConsumer +import org.apache.tools.ant.taskdefs.condition.Os plugins { // Adding the base plugin fixes the following gradle warnings in IntelliJ: @@ -62,8 +61,8 @@ ext { compileJava.options.encoding = 'UTF-8' compileJava.options.compilerArgs << '-parameter' -sourceCompatibility = 11 -targetCompatibility = 11 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 mainClassName = ''