From 34f266e4a0288d835ae13b647e5c0995f5d900cc Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 1 Jul 2022 22:08:05 +0200 Subject: [PATCH 1/3] Update dependencies --- FightSystem_10/build.gradle | 6 +++--- FightSystem_12/build.gradle | 6 +++--- FightSystem_14/build.gradle | 6 +++--- FightSystem_15/build.gradle | 6 +++--- FightSystem_18/build.gradle | 6 +++--- FightSystem_19/build.gradle | 6 +++--- FightSystem_8/build.gradle | 6 +++--- FightSystem_9/build.gradle | 6 +++--- FightSystem_Core/build.gradle | 4 ++-- FightSystem_Standalone/build.gradle | 2 +- build.gradle | 20 ++++++++++++++++++++ 11 files changed, 47 insertions(+), 27 deletions(-) diff --git a/FightSystem_10/build.gradle b/FightSystem_10/build.gradle index 5cfebcc..d82d1cd 100644 --- a/FightSystem_10/build.gradle +++ b/FightSystem_10/build.gradle @@ -44,7 +44,7 @@ sourceSets { dependencies { implementation project(":FightSystem_Core") - compileOnly files("${projectDir}/../lib/Spigot-1.10.jar") - compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar") - compileOnly files("${projectDir}/../lib/SpigotCore.jar") + compileOnly swdep("Spigot-1.10") + compileOnly swdep("WorldEdit-1.12") + compileOnly swdep("SpigotCore") } diff --git a/FightSystem_12/build.gradle b/FightSystem_12/build.gradle index bbe1745..fab5b1f 100644 --- a/FightSystem_12/build.gradle +++ b/FightSystem_12/build.gradle @@ -45,7 +45,7 @@ dependencies { implementation project(":FightSystem_Core") implementation project(":FightSystem_8") - compileOnly files("${projectDir}/../lib/Spigot-1.12.jar") - compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar") - compileOnly files("${projectDir}/../lib/SpigotCore.jar") + compileOnly swdep("Spigot-1.12") + compileOnly swdep("WorldEdit-1.12") + compileOnly swdep("SpigotCore") } diff --git a/FightSystem_14/build.gradle b/FightSystem_14/build.gradle index 5312c3a..29ff288 100644 --- a/FightSystem_14/build.gradle +++ b/FightSystem_14/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation project(":FightSystem_9") implementation project(":FightSystem_8") - compileOnly files("${projectDir}/../lib/Spigot-1.14.jar") - compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") - compileOnly files("${projectDir}/../lib/SpigotCore.jar") + compileOnly swdep("Spigot-1.14") + compileOnly swdep("WorldEdit-1.15") + compileOnly swdep("SpigotCore") } diff --git a/FightSystem_15/build.gradle b/FightSystem_15/build.gradle index dacb6a5..0fc5055 100644 --- a/FightSystem_15/build.gradle +++ b/FightSystem_15/build.gradle @@ -44,7 +44,7 @@ sourceSets { dependencies { implementation project(":FightSystem_Core") - compileOnly files("${projectDir}/../lib/Spigot-1.15.jar") - compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") - compileOnly files("${projectDir}/../lib/SpigotCore.jar") + compileOnly swdep("Spigot-1.15") + compileOnly swdep("WorldEdit-1.15") + compileOnly swdep("SpigotCore") } diff --git a/FightSystem_18/build.gradle b/FightSystem_18/build.gradle index 845a8fb..91b8b08 100644 --- a/FightSystem_18/build.gradle +++ b/FightSystem_18/build.gradle @@ -49,7 +49,7 @@ dependencies { compileOnly 'io.netty:netty-all:4.1.68.Final' compileOnly 'com.mojang:authlib:1.5.25' - compileOnly files("${projectDir}/../lib/Spigot-1.18.jar") - compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") - compileOnly files("${projectDir}/../lib/SpigotCore.jar") + compileOnly swdep("Spigot-1.18") + compileOnly swdep("WorldEdit-1.15") + compileOnly swdep("SpigotCore") } diff --git a/FightSystem_19/build.gradle b/FightSystem_19/build.gradle index 3a4d5c8..3633170 100644 --- a/FightSystem_19/build.gradle +++ b/FightSystem_19/build.gradle @@ -50,7 +50,7 @@ dependencies { compileOnly 'io.netty:netty-all:4.1.68.Final' compileOnly 'com.mojang:authlib:1.5.25' - compileOnly files("${projectDir}/../lib/Spigot-1.19.jar") - compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") - compileOnly files("${projectDir}/../lib/SpigotCore.jar") + compileOnly swdep("Spigot-1.19") + compileOnly swdep("WorldEdit-1.15") + compileOnly swdep("SpigotCore") } diff --git a/FightSystem_8/build.gradle b/FightSystem_8/build.gradle index 0b9c426..a91789b 100644 --- a/FightSystem_8/build.gradle +++ b/FightSystem_8/build.gradle @@ -44,7 +44,7 @@ sourceSets { dependencies { implementation project(":FightSystem_Core") - compileOnly files("${projectDir}/../lib/Spigot-1.8.jar") - compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar") - compileOnly files("${projectDir}/../lib/SpigotCore.jar") + compileOnly swdep("Spigot-1.8") + compileOnly files("WorldEdit-1.12") + compileOnly swdep("SpigotCore") } diff --git a/FightSystem_9/build.gradle b/FightSystem_9/build.gradle index d9054a5..172db2e 100644 --- a/FightSystem_9/build.gradle +++ b/FightSystem_9/build.gradle @@ -45,7 +45,7 @@ dependencies { implementation project(":FightSystem_Core") implementation project(":FightSystem_8") - compileOnly files("${projectDir}/../lib/Spigot-1.9.jar") - compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar") - compileOnly files("${projectDir}/../lib/SpigotCore.jar") + compileOnly swdep("Spigot-1.9") + compileOnly swdep("WorldEdit-1.12") + compileOnly files("SpigotCore") } diff --git a/FightSystem_Core/build.gradle b/FightSystem_Core/build.gradle index 41d367d..b9d32c2 100644 --- a/FightSystem_Core/build.gradle +++ b/FightSystem_Core/build.gradle @@ -47,6 +47,6 @@ dependencies { compileOnly 'io.netty:netty-all:4.1.68.Final' compileOnly 'com.mojang:authlib:1.5.25' - compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") - compileOnly files("${projectDir}/../lib/SpigotCore.jar") + compileOnly swdep("WorldEdit-1.15") + compileOnly swdep("SpigotCore") } diff --git a/FightSystem_Standalone/build.gradle b/FightSystem_Standalone/build.gradle index 404d2e3..615e3a4 100644 --- a/FightSystem_Standalone/build.gradle +++ b/FightSystem_Standalone/build.gradle @@ -61,7 +61,7 @@ dependencies { } } - implementation files("${projectDir}/../lib/SpigotCore.jar") + implementation swdep("SpigotCore") } task fixPluginYML(type: Copy) { diff --git a/build.gradle b/build.gradle index be1e8d7..b07c8aa 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,18 @@ plugins { id 'com.github.johnrengelman.shadow' version '5.0.0' } +ext.swdep = { s -> + if (file("${rootDir}/lib/${s}.jar").exists()) { + return files("${rootDir}/lib/${s}.jar") + } else { + if (s.contains("-")) { + return "de.steamwar:${s.toLowerCase().replace('-', ':')}" + } else { + return "de.steamwar:${s.toLowerCase()}:RELEASE" + } + } +} + group 'de.steamwar' version '' @@ -82,6 +94,14 @@ allprojects { maven { url = uri('https://libraries.minecraft.net') } + + maven { + url = uri('https://steamwar.de/maven') + credentials { + username = steamwarProperties.getProperty("maven.username") + password = steamwarProperties.getProperty("maven.password") + } + } } } From 0f600a2a04cee9d174f8697b927a6df1248c8da7 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sun, 3 Jul 2022 11:55:31 +0200 Subject: [PATCH 2/3] Fix build.gradle --- FightSystem_8/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FightSystem_8/build.gradle b/FightSystem_8/build.gradle index a91789b..076dfec 100644 --- a/FightSystem_8/build.gradle +++ b/FightSystem_8/build.gradle @@ -45,6 +45,6 @@ dependencies { implementation project(":FightSystem_Core") compileOnly swdep("Spigot-1.8") - compileOnly files("WorldEdit-1.12") + compileOnly swdep("WorldEdit-1.12") compileOnly swdep("SpigotCore") } From 4cdcb8a1d485a1b37032a6ca515cc4d03644bc69 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sun, 3 Jul 2022 12:10:17 +0200 Subject: [PATCH 3/3] Fix build.gradle --- FightSystem_9/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FightSystem_9/build.gradle b/FightSystem_9/build.gradle index 172db2e..03a9df3 100644 --- a/FightSystem_9/build.gradle +++ b/FightSystem_9/build.gradle @@ -47,5 +47,5 @@ dependencies { compileOnly swdep("Spigot-1.9") compileOnly swdep("WorldEdit-1.12") - compileOnly files("SpigotCore") + compileOnly swdep("SpigotCore") }