Merge pull request 'Update dependencies' (#355) from EasyDev into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #355 Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Commit
96b090b699
@ -44,7 +44,7 @@ sourceSets {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation project(":FightSystem_Core")
|
implementation project(":FightSystem_Core")
|
||||||
|
|
||||||
compileOnly files("${projectDir}/../lib/Spigot-1.10.jar")
|
compileOnly swdep("Spigot-1.10")
|
||||||
compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar")
|
compileOnly swdep("WorldEdit-1.12")
|
||||||
compileOnly files("${projectDir}/../lib/SpigotCore.jar")
|
compileOnly swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ dependencies {
|
|||||||
implementation project(":FightSystem_Core")
|
implementation project(":FightSystem_Core")
|
||||||
implementation project(":FightSystem_8")
|
implementation project(":FightSystem_8")
|
||||||
|
|
||||||
compileOnly files("${projectDir}/../lib/Spigot-1.12.jar")
|
compileOnly swdep("Spigot-1.12")
|
||||||
compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar")
|
compileOnly swdep("WorldEdit-1.12")
|
||||||
compileOnly files("${projectDir}/../lib/SpigotCore.jar")
|
compileOnly swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ dependencies {
|
|||||||
implementation project(":FightSystem_9")
|
implementation project(":FightSystem_9")
|
||||||
implementation project(":FightSystem_8")
|
implementation project(":FightSystem_8")
|
||||||
|
|
||||||
compileOnly files("${projectDir}/../lib/Spigot-1.14.jar")
|
compileOnly swdep("Spigot-1.14")
|
||||||
compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
|
compileOnly swdep("WorldEdit-1.15")
|
||||||
compileOnly files("${projectDir}/../lib/SpigotCore.jar")
|
compileOnly swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,7 @@ sourceSets {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation project(":FightSystem_Core")
|
implementation project(":FightSystem_Core")
|
||||||
|
|
||||||
compileOnly files("${projectDir}/../lib/Spigot-1.15.jar")
|
compileOnly swdep("Spigot-1.15")
|
||||||
compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
|
compileOnly swdep("WorldEdit-1.15")
|
||||||
compileOnly files("${projectDir}/../lib/SpigotCore.jar")
|
compileOnly swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ dependencies {
|
|||||||
compileOnly 'io.netty:netty-all:4.1.68.Final'
|
compileOnly 'io.netty:netty-all:4.1.68.Final'
|
||||||
compileOnly 'com.mojang:authlib:1.5.25'
|
compileOnly 'com.mojang:authlib:1.5.25'
|
||||||
|
|
||||||
compileOnly files("${projectDir}/../lib/Spigot-1.18.jar")
|
compileOnly swdep("Spigot-1.18")
|
||||||
compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
|
compileOnly swdep("WorldEdit-1.15")
|
||||||
compileOnly files("${projectDir}/../lib/SpigotCore.jar")
|
compileOnly swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ dependencies {
|
|||||||
compileOnly 'io.netty:netty-all:4.1.68.Final'
|
compileOnly 'io.netty:netty-all:4.1.68.Final'
|
||||||
compileOnly 'com.mojang:authlib:1.5.25'
|
compileOnly 'com.mojang:authlib:1.5.25'
|
||||||
|
|
||||||
compileOnly files("${projectDir}/../lib/Spigot-1.19.jar")
|
compileOnly swdep("Spigot-1.19")
|
||||||
compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
|
compileOnly swdep("WorldEdit-1.15")
|
||||||
compileOnly files("${projectDir}/../lib/SpigotCore.jar")
|
compileOnly swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,7 @@ sourceSets {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation project(":FightSystem_Core")
|
implementation project(":FightSystem_Core")
|
||||||
|
|
||||||
compileOnly files("${projectDir}/../lib/Spigot-1.8.jar")
|
compileOnly swdep("Spigot-1.8")
|
||||||
compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar")
|
compileOnly swdep("WorldEdit-1.12")
|
||||||
compileOnly files("${projectDir}/../lib/SpigotCore.jar")
|
compileOnly swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ dependencies {
|
|||||||
implementation project(":FightSystem_Core")
|
implementation project(":FightSystem_Core")
|
||||||
implementation project(":FightSystem_8")
|
implementation project(":FightSystem_8")
|
||||||
|
|
||||||
compileOnly files("${projectDir}/../lib/Spigot-1.9.jar")
|
compileOnly swdep("Spigot-1.9")
|
||||||
compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar")
|
compileOnly swdep("WorldEdit-1.12")
|
||||||
compileOnly files("${projectDir}/../lib/SpigotCore.jar")
|
compileOnly swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
@ -47,6 +47,6 @@ dependencies {
|
|||||||
compileOnly 'io.netty:netty-all:4.1.68.Final'
|
compileOnly 'io.netty:netty-all:4.1.68.Final'
|
||||||
compileOnly 'com.mojang:authlib:1.5.25'
|
compileOnly 'com.mojang:authlib:1.5.25'
|
||||||
|
|
||||||
compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
|
compileOnly swdep("WorldEdit-1.15")
|
||||||
compileOnly files("${projectDir}/../lib/SpigotCore.jar")
|
compileOnly swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
implementation files("${projectDir}/../lib/SpigotCore.jar")
|
implementation swdep("SpigotCore")
|
||||||
}
|
}
|
||||||
|
|
||||||
task fixPluginYML(type: Copy) {
|
task fixPluginYML(type: Copy) {
|
||||||
|
20
build.gradle
20
build.gradle
@ -35,6 +35,18 @@ plugins {
|
|||||||
id 'com.github.johnrengelman.shadow' version '5.0.0'
|
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'
|
group 'de.steamwar'
|
||||||
version ''
|
version ''
|
||||||
|
|
||||||
@ -82,6 +94,14 @@ allprojects {
|
|||||||
maven {
|
maven {
|
||||||
url = uri('https://libraries.minecraft.net')
|
url = uri('https://libraries.minecraft.net')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
maven {
|
||||||
|
url = uri('https://steamwar.de/maven')
|
||||||
|
credentials {
|
||||||
|
username = steamwarProperties.getProperty("maven.username")
|
||||||
|
password = steamwarProperties.getProperty("maven.password")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren