From 7bc5c31f5907be83f7cde0ac780ebca197555b7f Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 27 Jun 2022 21:17:53 +0200 Subject: [PATCH] Update some stuff Signed-off-by: yoyosource --- BauSystem_15/build.gradle | 6 +++--- BauSystem_18/build.gradle | 6 +++--- BauSystem_19/build.gradle | 6 +++--- BauSystem_Main/build.gradle | 6 +++--- build.gradle | 9 +++++++-- dependencies.gradle | 34 ---------------------------------- 6 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 dependencies.gradle diff --git a/BauSystem_15/build.gradle b/BauSystem_15/build.gradle index 4cb27d22..87ae1928 100644 --- a/BauSystem_15/build.gradle +++ b/BauSystem_15/build.gradle @@ -50,7 +50,7 @@ dependencies { implementation project(":BauSystem_Main") - compileOnly spigot15 - compileOnly worldEdit15 - compileOnly spigotCore + compileOnly swdep('Spigot-1.15') + compileOnly swdep('WorldEdit-1.15') + compileOnly swdep('SpigotCore') } \ No newline at end of file diff --git a/BauSystem_18/build.gradle b/BauSystem_18/build.gradle index 1528b092..8deb57fd 100644 --- a/BauSystem_18/build.gradle +++ b/BauSystem_18/build.gradle @@ -57,7 +57,7 @@ dependencies { compileOnly 'com.mojang:authlib:1.5.25' compileOnly 'com.mojang:brigadier:1.0.18' - compileOnly spigot18 - compileOnly worldEdit15 - compileOnly spigotCore + compileOnly swdep('Spigot-1.18') + compileOnly swdep('WorldEdit-1.15') + compileOnly swdep('SpigotCore') } \ No newline at end of file diff --git a/BauSystem_19/build.gradle b/BauSystem_19/build.gradle index cf962164..fb86e3ac 100644 --- a/BauSystem_19/build.gradle +++ b/BauSystem_19/build.gradle @@ -57,7 +57,7 @@ dependencies { compileOnly 'com.mojang:authlib:1.5.25' compileOnly 'com.mojang:brigadier:1.0.18' - compileOnly spigot19 - compileOnly worldEdit15 - compileOnly spigotCore + compileOnly swdep('Spigot-1.19') + compileOnly swdep('WorldEdit-1.15') + compileOnly swdep('SpigotCore') } \ No newline at end of file diff --git a/BauSystem_Main/build.gradle b/BauSystem_Main/build.gradle index 2bfcf6b8..8a23e1a3 100644 --- a/BauSystem_Main/build.gradle +++ b/BauSystem_Main/build.gradle @@ -60,7 +60,7 @@ dependencies { compileOnly 'com.mojang:authlib:1.5.25' compileOnly 'io.netty:netty-all:4.1.68.Final' - compileOnly spigot19 - compileOnly worldEdit15 - compileOnly spigotCore + compileOnly swdep('Spigot-1.19') + compileOnly swdep('WorldEdit-1.15') + compileOnly swdep('SpigotCore') } diff --git a/build.gradle b/build.gradle index 72e4c0ae..9fb106b9 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,13 @@ plugins { id 'com.github.johnrengelman.shadow' version '5.0.0' } -apply from: 'dependencies.gradle' +ext.swdep = { s -> + if (file("${rootDir}/lib/${s}.jar").exists()) { + return files("${rootDir}/lib/${s}.jar") + } else { + return "de.steamwar:${s.toLowerCase()}:RELEASE" + } +} group 'de.steamwar' version '' @@ -72,7 +78,6 @@ mainClassName = '' allprojects { repositories { mavenCentral() - jcenter() maven { url = uri("https://raw.githubusercontent.com/yoyosource/YAPION/master/releases") diff --git a/dependencies.gradle b/dependencies.gradle deleted file mode 100644 index 8c134e43..00000000 --- a/dependencies.gradle +++ /dev/null @@ -1,34 +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 . - */ - -ext { - spigot19 = depend('Spigot-1.19') - spigot18 = depend('Spigot-1.18') - spigot15 = depend('Spigot-1.15') - worldEdit15 = depend('WorldEdit-1.15') - spigotCore = depend('SpigotCore') -} - -private def depend(s) { - if (file("${rootDir}/lib/${s}.jar").exists()) { - return files("${rootDir}/lib/${s}.jar") - } else { - return "de.steamwar:${s.toLowerCase()}:RELEASE" - } -} \ No newline at end of file