🧹 Clean up the gradle build scripts a little
Changes: - Move all dependency versions to a shared file - Order the projects in settings.gradle
This commit is contained in:
parent
f3abbf5958
commit
d6ccc1d59b
13 changed files with 87 additions and 57 deletions
30
build.gradle
30
build.gradle
|
|
@ -17,6 +17,8 @@ plugins {
|
||||||
id 'de.marcphilipp.nexus-publish' version '0.4.0'
|
id 'de.marcphilipp.nexus-publish' version '0.4.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
apply from: 'scripts/dependencies.gradle'
|
||||||
|
|
||||||
checkstyle {
|
checkstyle {
|
||||||
configFile file('config/checkstyle/checkstyle.xml')
|
configFile file('config/checkstyle/checkstyle.xml')
|
||||||
}
|
}
|
||||||
|
|
@ -71,52 +73,48 @@ subprojects {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
jcenter()
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
/* Sonatype Snapshots */
|
||||||
url = 'https://oss.sonatype.org/content/repositories/snapshots'
|
url = 'https://oss.sonatype.org/content/repositories/snapshots'
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
/* ViaVersion, used for adventure */
|
||||||
url = 'https://repo.viaversion.com/'
|
url = 'https://repo.viaversion.com/'
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
/* Velocity, used for cloud-velocity */
|
||||||
url = 'https://repo.velocitypowered.com/snapshots/'
|
url = 'https://repo.velocitypowered.com/snapshots/'
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
/* The Minecraft repository, used for cloud-brigadier */
|
||||||
url = 'https://libraries.minecraft.net/'
|
url = 'https://libraries.minecraft.net/'
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
/* The current Sponge repository */
|
||||||
url = 'https://repo.spongepowered.org/maven'
|
url = 'https://repo.spongepowered.org/maven'
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
/* The Spigot repository, used for cloud-bukkit */
|
||||||
url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
|
url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
/* The paper repository, used for cloud-paper */
|
||||||
url = 'https://papermc.io/repo/repository/maven-public/'
|
url = 'https://papermc.io/repo/repository/maven-public/'
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
|
||||||
url = 'https://libraries.minecraft.net'
|
|
||||||
}
|
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
/* The NukkitX repository, used for cloud-cloudburst */
|
||||||
url = 'https://repo.nukkitx.com/maven-snapshots'
|
url = 'https://repo.nukkitx.com/maven-snapshots'
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
/* JitPack, used for random dependencies */
|
||||||
url = 'https://jitpack.io'
|
url = 'https://jitpack.io'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly 'org.checkerframework:checker-qual:3.7.0'
|
compileOnly "org.checkerframework:checker-qual:${vers['checker-qual']}"
|
||||||
api 'io.leangen.geantyref:geantyref:1.3.11'
|
api "io.leangen.geantyref:geantyref:${vers['geantyref']}"
|
||||||
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
|
testImplementation "org.junit.jupiter:junit-jupiter-engine:${vers['jupiter-engine']}"
|
||||||
}
|
}
|
||||||
|
|
||||||
nexusPublishing {
|
nexusPublishing {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':cloud-services')
|
api project(':cloud-services')
|
||||||
testImplementation 'org.openjdk.jmh:jmh-core:1.25.2'
|
testImplementation "org.openjdk.jmh:jmh-core:${vers['jhm']}"
|
||||||
testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.26'
|
testImplementation "org.openjdk.jmh:jmh-generator-annprocess:${vers['jhm']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':cloud-core')
|
api project(':cloud-core')
|
||||||
implementation 'org.javacord:javacord:3.1.1'
|
implementation "org.javacord:javacord:${vers['javacord']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':cloud-core')
|
api project(':cloud-core')
|
||||||
compileOnly 'net.dv8tion:JDA:4.2.0_209'
|
compileOnly "net.dv8tion:JDA:${vers['jda']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':cloud-core')
|
implementation project(':cloud-core')
|
||||||
/* Needs to be provided by the platform */
|
/* Needs to be provided by the platform */
|
||||||
compileOnly 'com.mojang:brigadier:1.0.17'
|
compileOnly "com.mojang:brigadier:${vers['brigadier']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,6 @@ dependencies {
|
||||||
api project(':cloud-core')
|
api project(':cloud-core')
|
||||||
api project(':cloud-brigadier')
|
api project(':cloud-brigadier')
|
||||||
api project(':cloud-tasks')
|
api project(':cloud-tasks')
|
||||||
compileOnly 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
|
compileOnly "org.bukkit:bukkit:${vers['bukkit']}"
|
||||||
compileOnly 'me.lucko:commodore:1.9'
|
compileOnly "me.lucko:commodore:${vers['commodore']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':cloud-core')
|
api project(':cloud-core')
|
||||||
compileOnly 'net.md-5:bungeecord-api:1.8-SNAPSHOT'
|
compileOnly "net.md-5:bungeecord-api:${vers['bungeecord']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':cloud-core')
|
api project(':cloud-core')
|
||||||
compileOnly 'org.cloudburstmc:cloudburst-server:1.0.0-SNAPSHOT'
|
compileOnly "org.cloudburstmc:cloudburst-server:${vers['cloudburst']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':cloud-core')
|
api project(':cloud-core')
|
||||||
api 'net.kyori:adventure-api:4.1.1'
|
api "net.kyori:adventure-api:${vers['adventure-api']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':cloud-bukkit')
|
api project(':cloud-bukkit')
|
||||||
compileOnly 'com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT'
|
compileOnly "com.destroystokyo.paper:paper-api:${vers['paper-api']}"
|
||||||
compileOnly 'com.destroystokyo.paper:paper-mojangapi:1.15.2-R0.1-SNAPSHOT'
|
compileOnly "com.destroystokyo.paper:paper-mojangapi:${vers['paper-api']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':cloud-core')
|
api project(':cloud-core')
|
||||||
api project(':cloud-brigadier')
|
api project(':cloud-brigadier')
|
||||||
compileOnly 'com.velocitypowered:velocity-api:1.1.0-SNAPSHOT'
|
compileOnly "com.velocitypowered:velocity-api:${vers['velocity-api']}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
21
scripts/dependencies.gradle
Normal file
21
scripts/dependencies.gradle
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
ext {
|
||||||
|
vers = [
|
||||||
|
'checker-qual' : '3.7.0',
|
||||||
|
'geantyref' : '1.3.11',
|
||||||
|
// DISCORD DEPENDENCIES
|
||||||
|
'javacord' : '3.1.1',
|
||||||
|
'jda' : '4.2.0_209',
|
||||||
|
// MINECRAFT DEPENDENCIES
|
||||||
|
'brigadier' : '1.0.17',
|
||||||
|
'bukkit' : '1.13.2-RO.1-SNAPSHOT',
|
||||||
|
'commodore' : '1.9',
|
||||||
|
'bungeecord' : '1.8-SNAPSHOT',
|
||||||
|
'cloudburst' : '1.0.0-SNAPSHOT',
|
||||||
|
'adventure-api' : '4.1.1',
|
||||||
|
'paper-api' : '1.15.2-R0.1-SNAPSHOT',
|
||||||
|
'velocity-api' : '1.1.0-SNAPSHOT',
|
||||||
|
// TEST DEPENDENCIES
|
||||||
|
'jupiter-engine': '5.7.0',
|
||||||
|
'jhm' : '1.25.2'
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
@ -1,36 +1,47 @@
|
||||||
rootProject.name = 'cloud'
|
rootProject.name = 'cloud'
|
||||||
|
//
|
||||||
|
// Core Modules
|
||||||
|
//
|
||||||
|
include(':cloud-annotations')
|
||||||
include(':cloud-core')
|
include(':cloud-core')
|
||||||
include(':cloud-services')
|
include(':cloud-services')
|
||||||
include(':cloud-annotations')
|
|
||||||
include(':cloud-bukkit')
|
|
||||||
include(':cloud-paper')
|
|
||||||
include(':cloud-brigadier')
|
|
||||||
include(':cloud-bungee')
|
|
||||||
include(':cloud-velocity')
|
|
||||||
include(':cloud-minecraft-extras')
|
|
||||||
include(':cloud-cloudburst')
|
|
||||||
include(':cloud-javacord')
|
|
||||||
include(':cloud-jda')
|
|
||||||
include(':example-bukkit')
|
|
||||||
include(':example-javacord')
|
|
||||||
include(':example-jda')
|
|
||||||
include(':cloud-tasks')
|
include(':cloud-tasks')
|
||||||
include(':cloud-sponge')
|
//
|
||||||
include(':example-velocity')
|
//Discord Modules
|
||||||
include(':example-bungee')
|
//
|
||||||
project(':cloud-bukkit').projectDir = file('cloud-minecraft/cloud-bukkit')
|
include(':cloud-javacord')
|
||||||
project(':cloud-paper').projectDir = file('cloud-minecraft/cloud-paper')
|
|
||||||
project(':cloud-brigadier').projectDir = file('cloud-minecraft/cloud-brigadier')
|
|
||||||
project(':cloud-bungee').projectDir = file('cloud-minecraft/cloud-bungee')
|
|
||||||
project(':cloud-velocity').projectDir = file('cloud-minecraft/cloud-velocity')
|
|
||||||
project(':cloud-minecraft-extras').projectDir = file('cloud-minecraft/cloud-minecraft-extras')
|
|
||||||
project(':cloud-cloudburst').projectDir = file('cloud-minecraft/cloud-cloudburst')
|
|
||||||
project(':cloud-javacord').projectDir = file('cloud-discord/cloud-javacord')
|
project(':cloud-javacord').projectDir = file('cloud-discord/cloud-javacord')
|
||||||
|
include(':cloud-jda')
|
||||||
project(':cloud-jda').projectDir = file('cloud-discord/cloud-jda')
|
project(':cloud-jda').projectDir = file('cloud-discord/cloud-jda')
|
||||||
project(':example-bukkit').projectDir = file('examples/example-bukkit')
|
//
|
||||||
project(':example-javacord').projectDir = file('examples/example-javacord')
|
// Minecraft Modules
|
||||||
project(':example-jda').projectDir = file('examples/example-jda')
|
//
|
||||||
|
include(':cloud-brigadier')
|
||||||
|
project(':cloud-brigadier').projectDir = file('cloud-minecraft/cloud-brigadier')
|
||||||
|
include(':cloud-bukkit')
|
||||||
|
project(':cloud-bukkit').projectDir = file('cloud-minecraft/cloud-bukkit')
|
||||||
|
include(':cloud-bungee')
|
||||||
|
project(':cloud-bungee').projectDir = file('cloud-minecraft/cloud-bungee')
|
||||||
|
include(':cloud-cloudburst')
|
||||||
|
project(':cloud-cloudburst').projectDir = file('cloud-minecraft/cloud-cloudburst')
|
||||||
|
include(':cloud-minecraft-extras')
|
||||||
|
project(':cloud-minecraft-extras').projectDir = file('cloud-minecraft/cloud-minecraft-extras')
|
||||||
|
include(':cloud-paper')
|
||||||
|
project(':cloud-paper').projectDir = file('cloud-minecraft/cloud-paper')
|
||||||
|
include(':cloud-sponge')
|
||||||
project(':cloud-sponge').projectDir = file('cloud-minecraft/cloud-sponge')
|
project(':cloud-sponge').projectDir = file('cloud-minecraft/cloud-sponge')
|
||||||
project(':example-velocity').projectDir = file('examples/example-velocity')
|
include(':cloud-velocity')
|
||||||
|
project(':cloud-velocity').projectDir = file('cloud-minecraft/cloud-velocity')
|
||||||
|
//
|
||||||
|
// Example Modules
|
||||||
|
//
|
||||||
|
include(':example-bukkit')
|
||||||
|
project(':example-bukkit').projectDir = file('examples/example-bukkit')
|
||||||
|
include(':example-bungee')
|
||||||
project(':example-bungee').projectDir = file('examples/example-bungee')
|
project(':example-bungee').projectDir = file('examples/example-bungee')
|
||||||
|
include(':example-javacord')
|
||||||
|
project(':example-javacord').projectDir = file('examples/example-javacord')
|
||||||
|
include(':example-jda')
|
||||||
|
project(':example-jda').projectDir = file('examples/example-jda')
|
||||||
|
include(':example-velocity')
|
||||||
|
project(':example-velocity').projectDir = file('examples/example-velocity')
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue