13
0

Merge pull request 'Update dependency management' (#123) from EasyDev into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Reviewed-on: #123
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
Dieser Commit ist enthalten in:
Chaoscaot 2022-07-03 12:39:36 +02:00
Commit 62dafab6d7
7 geänderte Dateien mit 37 neuen und 52 gelöschten Zeilen

Datei anzeigen

@ -50,7 +50,7 @@ dependencies {
implementation project(":SchematicSystem_Core") implementation project(":SchematicSystem_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")
} }

Datei anzeigen

@ -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 <https://www.gnu.org/licenses/>.
*/
rootProject.name = 'SchematicSystem_15'

Datei anzeigen

@ -50,7 +50,7 @@ dependencies {
implementation project(":SchematicSystem_Core") implementation project(":SchematicSystem_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")
} }

Datei anzeigen

@ -48,7 +48,7 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok:1.18.22' annotationProcessor 'org.projectlombok:lombok:1.18.22'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
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")
} }

Datei anzeigen

@ -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 <https://www.gnu.org/licenses/>.
*/
rootProject.name = 'SchematicSystem_Core'

Datei anzeigen

@ -36,6 +36,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 ''
@ -83,6 +95,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")
}
}
} }
} }

Datei anzeigen

@ -19,6 +19,11 @@
rootProject.name = 'SchematicSystem' rootProject.name = 'SchematicSystem'
include 'SchematicSystem_8' file('.').listFiles().each {
include 'SchematicSystem_15' if (!it.isDirectory()) {
include 'SchematicSystem_Core' return
}
if (new File(it, "build.gradle").exists()) {
include(it.name)
}
}