Gradle 7 Update by Kopo (#1931)
Updates gradle to version 7 and sorts out all the deprecated stuff Affects issues: - Clsoe #1871 Co-authored-by: Antti Koponen <koponen942@outlook.com>
This commit is contained in:
Risto Lahtela
GitHub
parent
a324c7ee24
commit
fa4a2e6595
|
|
@ -1,6 +1,6 @@
|
|||
dependencies {
|
||||
compileOnly "org.apache.commons:commons-text:$commonsTextVersion"
|
||||
testCompile "org.apache.commons:commons-text:$commonsTextVersion"
|
||||
testImplementation "org.apache.commons:commons-text:$commonsTextVersion"
|
||||
compileOnly "com.google.code.gson:gson:$gsonVersion"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ buildscript {
|
|||
}
|
||||
|
||||
plugins {
|
||||
id "com.github.johnrengelman.shadow" version "7.0.0"
|
||||
id "java"
|
||||
id "jacoco"
|
||||
id "checkstyle"
|
||||
id "org.sonarqube" version "3.3"
|
||||
id "net.ltgt.apt" version "0.21"
|
||||
id "net.ltgt.apt-idea" version "0.21"
|
||||
id "com.github.johnrengelman.shadow" version "6.1.0"
|
||||
// id "net.ltgt.apt" version "0.21"
|
||||
// id "net.ltgt.apt-idea" version "0.21"
|
||||
}
|
||||
|
||||
apply plugin: 'nebula-aggregate-javadocs'
|
||||
|
|
@ -30,7 +30,7 @@ def determineBuildVersion = {
|
|||
def buildVersion = determineBuildVersion()
|
||||
|
||||
allprojects {
|
||||
wrapper.gradleVersion = "6.2.1"
|
||||
wrapper.gradleVersion = "7.0.2"
|
||||
|
||||
group "com.djrapitops"
|
||||
version "5.3-SNAPSHOT"
|
||||
|
|
@ -46,15 +46,13 @@ allprojects {
|
|||
javadoc { options.encoding = 'UTF-8' }
|
||||
}
|
||||
|
||||
println "Building artifact for version $fullVersion"
|
||||
logger.lifecycle("Building artifact for version $fullVersion")
|
||||
|
||||
subprojects {
|
||||
// Build plugins
|
||||
apply plugin: "com.github.johnrengelman.shadow"
|
||||
apply plugin: "java"
|
||||
apply plugin: "maven-publish"
|
||||
apply plugin: "net.ltgt.apt" // Annotation processing plugin
|
||||
apply plugin: "net.ltgt.apt-idea" // Annotation processing IntelliJ IDEA configuration plugin
|
||||
apply plugin: "com.github.johnrengelman.shadow"
|
||||
|
||||
// Report plugins
|
||||
apply plugin: "checkstyle"
|
||||
|
|
@ -63,95 +61,76 @@ subprojects {
|
|||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
|
||||
ext.daggerVersion = "2.37"
|
||||
ext.daggerCompilerVersion = "2.37"
|
||||
ext {
|
||||
daggerVersion = "2.37"
|
||||
daggerCompilerVersion = "2.37"
|
||||
|
||||
ext.palVersion = "4.1.0"
|
||||
palVersion = "4.1.0"
|
||||
|
||||
ext.bukkitVersion = "1.13.2-R0.1-SNAPSHOT"
|
||||
ext.spigotVersion = "1.13.2-R0.1-SNAPSHOT"
|
||||
ext.paperVersion = "1.16.5-R0.1-SNAPSHOT"
|
||||
ext.spongeVersion = "7.3.0"
|
||||
ext.nukkitVersion = "1.0-SNAPSHOT"
|
||||
ext.bungeeVersion = "1.16-R0.4"
|
||||
ext.velocityVersion = "1.0.0-SNAPSHOT"
|
||||
ext.redisBungeeVersion = "0.6.3"
|
||||
bukkitVersion = "1.13.2-R0.1-SNAPSHOT"
|
||||
spigotVersion = "1.13.2-R0.1-SNAPSHOT"
|
||||
paperVersion = "1.16.5-R0.1-SNAPSHOT"
|
||||
spongeVersion = "7.3.0"
|
||||
nukkitVersion = "1.0-SNAPSHOT"
|
||||
bungeeVersion = "1.16-R0.4"
|
||||
velocityVersion = "1.0.0-SNAPSHOT"
|
||||
redisBungeeVersion = "0.6.3"
|
||||
|
||||
ext.commonsTextVersion = "1.9"
|
||||
ext.commonsCompressVersion = "1.20"
|
||||
ext.caffeineVersion = "2.8.0"
|
||||
ext.h2Version = "1.4.199"
|
||||
ext.mysqlVersion = "8.0.25"
|
||||
ext.sqliteVersion = "3.34.0"
|
||||
ext.hikariVersion = "4.0.3"
|
||||
ext.slf4jVersion = "1.7.30"
|
||||
ext.geoIpVersion = "2.15.0"
|
||||
ext.gsonVersion = "2.8.7"
|
||||
ext.guavaVersion = "28.0-jre"
|
||||
ext.bstatsVersion = "2.2.1"
|
||||
ext.placeholderapiVersion = "2.10.9"
|
||||
ext.nkPlaceholderapiVersion = "1.4-SNAPSHOT"
|
||||
commonsTextVersion = "1.9"
|
||||
commonsCompressVersion = "1.20"
|
||||
caffeineVersion = "2.8.0"
|
||||
h2Version = "1.4.199"
|
||||
mysqlVersion = "8.0.25"
|
||||
sqliteVersion = "3.34.0"
|
||||
hikariVersion = "4.0.3"
|
||||
slf4jVersion = "1.7.30"
|
||||
geoIpVersion = "2.15.0"
|
||||
gsonVersion = "2.8.7"
|
||||
guavaVersion = "28.0-jre"
|
||||
bstatsVersion = "2.2.1"
|
||||
placeholderapiVersion = "2.10.9"
|
||||
nkPlaceholderapiVersion = "1.4-SNAPSHOT"
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { // Spigot Repository
|
||||
url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/"
|
||||
}
|
||||
maven { // Paper Repository
|
||||
url = "https://papermc.io/repo/repository/maven-public/"
|
||||
}
|
||||
maven { // Sponge Repository
|
||||
url = "https://repo.spongepowered.org/repository/maven-public/"
|
||||
}
|
||||
maven { // BungeeCord Repository
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots"
|
||||
}
|
||||
maven { // RedisBungee Repository
|
||||
url = "https://repo.md-5.net/content/repositories/snapshots/"
|
||||
}
|
||||
maven { // Velocity Repository
|
||||
url = "https://repo.velocitypowered.com/snapshots/"
|
||||
}
|
||||
maven { // Nukkit Repository
|
||||
url = "https://repo.opencollab.dev/maven-snapshots/"
|
||||
}
|
||||
maven { // Nukkit Repository
|
||||
url = "https://repo.opencollab.dev/maven-releases/"
|
||||
}
|
||||
maven { // bStats Repository
|
||||
url = "https://repo.codemc.org/repository/maven-public"
|
||||
}
|
||||
maven { // Plan Repository
|
||||
url = "https://repo.playeranalytics.net/releases"
|
||||
}
|
||||
maven { url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" } // Spigot
|
||||
maven { url = "https://papermc.io/repo/repository/maven-public/" } // Paper
|
||||
maven { url = "https://repo.spongepowered.org/repository/maven-public/" } // Sponge
|
||||
maven { url = "https://oss.sonatype.org/content/repositories/snapshots" } // BungeeCord
|
||||
maven { url = "https://repo.md-5.net/content/repositories/snapshots/" } // RedisBungee
|
||||
maven { url = "https://repo.velocitypowered.com/snapshots/" } // Velocity
|
||||
maven { url = "https://repo.opencollab.dev/maven-snapshots/" } // Nukkit snapshot
|
||||
maven { url = "https://repo.opencollab.dev/maven-releases/" } // Nukkit release
|
||||
maven { url = "https://repo.codemc.org/repository/maven-public" } // bStats
|
||||
maven { url = "https://repo.playeranalytics.net/releases" } // Plan
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// Dependency Injection used across the project
|
||||
compile "com.google.dagger:dagger:$daggerVersion"
|
||||
implementation "com.google.dagger:dagger:$daggerVersion"
|
||||
annotationProcessor "com.google.dagger:dagger-compiler:$daggerCompilerVersion"
|
||||
testAnnotationProcessor "com.google.dagger:dagger-compiler:$daggerCompilerVersion"
|
||||
|
||||
// Test Tooling Dependencies
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
|
||||
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.2" // JUnit 5
|
||||
testCompile "org.junit.jupiter:junit-jupiter-params:5.7.2" // JUnit 5, parameterized tests
|
||||
testCompile "org.mockito:mockito-core:3.11.0" // Mockito Core
|
||||
testCompile "org.mockito:mockito-junit-jupiter:3.11.0" // Mockito JUnit 5 Extension
|
||||
testCompile "org.seleniumhq.selenium:selenium-java:3.141.59" // Selenium (Browser tests)
|
||||
testCompile "com.jayway.awaitility:awaitility:1.7.0" // Awaitility (Concurrent wait conditions)
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2' // JUnit 5
|
||||
testImplementation "org.mockito:mockito-core:3.11.0" // Mockito Core
|
||||
testImplementation "org.mockito:mockito-junit-jupiter:3.11.0" // Mockito JUnit 5 Extension
|
||||
testImplementation "org.seleniumhq.selenium:selenium-java:3.141.59" // Selenium (Browser tests)
|
||||
testImplementation "com.jayway.awaitility:awaitility:1.7.0" // Awaitility (Concurrent wait conditions)
|
||||
|
||||
// Testing dependencies required by Plan
|
||||
testCompile "org.xerial:sqlite-jdbc:$sqliteVersion" // SQLite
|
||||
testCompile "mysql:mysql-connector-java:$mysqlVersion" // MySQL
|
||||
testImplementation "org.xerial:sqlite-jdbc:$sqliteVersion" // SQLite
|
||||
testImplementation "mysql:mysql-connector-java:$mysqlVersion" // MySQL
|
||||
testImplementation "com.h2database:h2:$h2Version" // H2
|
||||
}
|
||||
|
||||
configurations {
|
||||
testArtifacts.extendsFrom testRuntime
|
||||
testArtifacts.extendsFrom testRuntimeOnly
|
||||
}
|
||||
// Test classes available to other modules
|
||||
task testJar(type: Jar) {
|
||||
classifier "test"
|
||||
archiveClassifier.set("test")
|
||||
from sourceSets.test.output
|
||||
}
|
||||
artifacts {
|
||||
|
|
|
|||
|
|
@ -1,27 +1,25 @@
|
|||
repositories {
|
||||
maven { // Placeholder API repository
|
||||
url = "http://repo.extendedclip.com/content/repositories/placeholderapi/"
|
||||
url = "https://repo.extendedclip.com/content/repositories/placeholderapi/"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(":common")
|
||||
compile project(path: ":common", configuration: 'shadow')
|
||||
implementation project(path: ":common", configuration: 'shadow')
|
||||
compileOnly project(":api")
|
||||
|
||||
compile "net.playeranalytics:platform-abstraction-layer-bukkit:$palVersion"
|
||||
compile "org.bstats:bstats-bukkit:$bstatsVersion"
|
||||
implementation "net.playeranalytics:platform-abstraction-layer-bukkit:$palVersion"
|
||||
implementation "org.bstats:bstats-bukkit:$bstatsVersion"
|
||||
compileOnly "me.clip:placeholderapi:$placeholderapiVersion"
|
||||
|
||||
compileOnly "com.destroystokyo.paper:paper-api:$paperVersion"
|
||||
testCompile "com.destroystokyo.paper:paper-api:$paperVersion"
|
||||
testImplementation "com.destroystokyo.paper:paper-api:$paperVersion"
|
||||
|
||||
testCompile project(path: ":common", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":common", configuration: 'testArtifacts')
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
configurations = [project.configurations.compile]
|
||||
|
||||
relocate 'org.bstats', 'com.djrapitops.plan.utilities.metrics'
|
||||
relocate 'org.slf4j', 'plan.org.slf4j'
|
||||
}
|
||||
|
|
@ -1,22 +1,20 @@
|
|||
dependencies {
|
||||
compileOnly project(":common")
|
||||
compile project(path: ":common", configuration: 'shadow')
|
||||
implementation project(path: ":common", configuration: 'shadow')
|
||||
compileOnly project(":api")
|
||||
|
||||
compile "net.playeranalytics:platform-abstraction-layer-bungeecord:$palVersion"
|
||||
compile "org.bstats:bstats-bungeecord:$bstatsVersion"
|
||||
implementation "net.playeranalytics:platform-abstraction-layer-bungeecord:$palVersion"
|
||||
implementation "org.bstats:bstats-bungeecord:$bstatsVersion"
|
||||
|
||||
compileOnly "net.md-5:bungeecord-api:$bungeeVersion"
|
||||
compileOnly "com.imaginarycode.minecraft:RedisBungee:$redisBungeeVersion"
|
||||
testCompile "net.md-5:bungeecord-api:$bungeeVersion"
|
||||
testCompile "com.imaginarycode.minecraft:RedisBungee:$redisBungeeVersion"
|
||||
testImplementation "net.md-5:bungeecord-api:$bungeeVersion"
|
||||
testImplementation "com.imaginarycode.minecraft:RedisBungee:$redisBungeeVersion"
|
||||
|
||||
testCompile project(path: ":common", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":common", configuration: 'testArtifacts')
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
configurations = [project.configurations.compile]
|
||||
|
||||
relocate 'org.bstats', 'com.djrapitops.plan.utilities.metrics'
|
||||
relocate 'org.slf4j', 'plan.org.slf4j'
|
||||
}
|
||||
|
|
@ -1,22 +1,22 @@
|
|||
dependencies {
|
||||
compile "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
|
||||
compile project(":api")
|
||||
implementation "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
|
||||
implementation project(":api")
|
||||
compileOnly project(":extensions")
|
||||
compile project(path: ":extensions", configuration: 'shadow')
|
||||
compile "org.apache.commons:commons-text:$commonsTextVersion"
|
||||
compile "org.apache.commons:commons-compress:$commonsCompressVersion"
|
||||
compile "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
|
||||
implementation "com.h2database:h2:$h2Version"
|
||||
implementation "mysql:mysql-connector-java:$mysqlVersion"
|
||||
implementation "org.xerial:sqlite-jdbc:$sqliteVersion"
|
||||
compile "com.zaxxer:HikariCP:$hikariVersion"
|
||||
compile "org.slf4j:slf4j-nop:$slf4jVersion"
|
||||
compile "org.slf4j:slf4j-api:$slf4jVersion"
|
||||
compile "com.maxmind.geoip2:geoip2:$geoIpVersion"
|
||||
compile "com.google.code.gson:gson:$gsonVersion"
|
||||
implementation project(path: ":extensions", configuration: 'shadow')
|
||||
implementation "org.apache.commons:commons-text:$commonsTextVersion"
|
||||
implementation "org.apache.commons:commons-compress:$commonsCompressVersion"
|
||||
implementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
|
||||
compileOnly "com.h2database:h2:$h2Version"
|
||||
compileOnly "mysql:mysql-connector-java:$mysqlVersion"
|
||||
compileOnly "org.xerial:sqlite-jdbc:$sqliteVersion"
|
||||
implementation "com.zaxxer:HikariCP:$hikariVersion"
|
||||
implementation "org.slf4j:slf4j-nop:$slf4jVersion"
|
||||
implementation "org.slf4j:slf4j-api:$slf4jVersion"
|
||||
implementation "com.maxmind.geoip2:geoip2:$geoIpVersion"
|
||||
implementation "com.google.code.gson:gson:$gsonVersion"
|
||||
|
||||
testCompile project(":api")
|
||||
testCompile "com.google.code.gson:gson:$gsonVersion"
|
||||
testImplementation project(":api")
|
||||
testImplementation "com.google.code.gson:gson:$gsonVersion"
|
||||
}
|
||||
|
||||
import org.apache.tools.ant.filters.ReplaceTokens
|
||||
|
|
@ -30,13 +30,13 @@ task updateVersion(type: Copy) {
|
|||
filter(ReplaceTokens, tokens: [version: '' + project.ext.fullVersion])
|
||||
}
|
||||
processResources {
|
||||
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
||||
dependsOn updateVersion
|
||||
from 'build/sources/resources'
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
dependsOn processResources
|
||||
configurations = [project.configurations.compile]
|
||||
|
||||
// Exclude these files
|
||||
exclude "**/*.svg"
|
||||
|
|
@ -51,7 +51,6 @@ shadowJar {
|
|||
relocate 'com.maxmind', 'plan.com.maxmind'
|
||||
relocate 'com.fasterxml', 'plan.com.fasterxml'
|
||||
relocate 'com.zaxxer', 'plan.com.zaxxer'
|
||||
relocate 'com.google.protobuf', 'plan.com.google.protobuf'
|
||||
relocate 'com.google.gson', 'plan.com.google.gson'
|
||||
relocate 'com.google.errorprone', 'plan.com.google.errorprone'
|
||||
relocate 'org.h2', 'plan.org.h2'
|
||||
|
|
|
|||
|
|
@ -1,55 +1,53 @@
|
|||
dependencies {
|
||||
compile project(path: ":api")
|
||||
compile 'com.djrapitops:Extension-AAC:4.4.2-R0.1'
|
||||
compile 'com.djrapitops:Extension-AdvancedAchievements:6.4.0-R0.1'
|
||||
compile 'com.djrapitops:Extension-AdvancedBan:2.1.5-R1.0'
|
||||
compile 'com.djrapitops:Extension-ASkyBlock:3.0.9.4-R0.5'
|
||||
compile 'com.djrapitops:Extension-AuthMe:5.6.0-R0.2'
|
||||
compile 'com.djrapitops:Extension-BanManager:7.3.1-R0.2'
|
||||
compile 'com.djrapitops:Extension-BentoBox:1.15.5-R1.0'
|
||||
compile 'com.djrapitops:Extension-CoreProtect:2.16.0-R0.4'
|
||||
compile 'com.djrapitops:Extension-DiscordSRV:1.18.0-R0.3'
|
||||
compile 'com.djrapitops:Extension-DKBans:2.1.2-R0.3'
|
||||
compile 'com.djrapitops:Extension-DKCoins:3.0.5-R0.1'
|
||||
compile 'com.djrapitops:Extension-EssentialsX:2.15.0-R0.6'
|
||||
compile 'com.djrapitops:Extension-Factions:2.14.0-R0.1'
|
||||
compile 'com.djrapitops:Extension-FactionsUUID:1.6.9.5-U0.5.16-R0.2'
|
||||
compile 'com.djrapitops:Extension-FastLogin:R0.1'
|
||||
compile 'com.djrapitops:Extension-Floodgate:1.0-R1.2'
|
||||
compile 'com.djrapitops:Extension-GriefDefender:R0.2'
|
||||
compile 'com.djrapitops:Extension-GriefPrevention:16.11.6-R0.2'
|
||||
compile 'com.djrapitops:Extension-GriefPrevention-Sponge:4.0.1-R0.2'
|
||||
compile 'com.djrapitops:Extension-Heroes:R0.2'
|
||||
compile 'com.djrapitops:Extension-Jobs:4.16.3-R0.1'
|
||||
compile 'com.djrapitops:Extension-KingdomsX:1.10.17-R0.3'
|
||||
compile 'com.djrapitops:Extension-Lands:5.4.12-R0.1'
|
||||
compile 'com.djrapitops:Extension-Litebans:0.3.4-R0.1'
|
||||
compile 'com.djrapitops:Extension-LogBlock:1.16.1.2-R0.2'
|
||||
compile 'com.djrapitops:Extension-LuckPerms:5.0-R0.2'
|
||||
compile 'com.djrapitops:Extension-MarriageMaster:2.3-R0.2'
|
||||
compile 'com.djrapitops:Extension-McMMO:2.1.149-R1.5'
|
||||
compile 'com.djrapitops:Extension-MinigamesLib:1.14.17-R0.2'
|
||||
compile 'com.djrapitops:Extension-MyPet:3.10-R0.2'
|
||||
compile 'com.djrapitops:Extension-Nucleus:2.3.0-R0.1'
|
||||
compile 'com.djrapitops:Extension-nuVotifier:2.3.4-R0.3'
|
||||
compile 'com.djrapitops:Extension-PlaceholderAPI:2.10.9-R0.3.2'
|
||||
compile 'com.djrapitops:Extension-PlotSquared:5.13.11-R0.1'
|
||||
compile 'com.djrapitops:Extension-ProtectionStones:2.8.2-R0.1'
|
||||
compile 'com.djrapitops:Extension-ProtocolSupport:1.16.4-R0.1'
|
||||
compile 'com.djrapitops:Extension-Quests:4.0.2-R0.3'
|
||||
compile 'com.djrapitops:Extension-React:6.651-R0.1'
|
||||
compile 'com.djrapitops:Extension-RedProtect:7.7.3-R0.1'
|
||||
compile 'com.djrapitops:Extension-Sponge-Economy:7.1.0-R0.3'
|
||||
compile 'com.djrapitops:Extension-SuperbVote:0.5.4-R0.1'
|
||||
compile 'com.djrapitops:Extension-Tebex:R1.2'
|
||||
compile 'com.djrapitops:Extension-Towny:0.96.7.4-R0.2'
|
||||
compile 'com.djrapitops:Extension-Vault:1.7-R0.3'
|
||||
compile 'com.djrapitops:Extension-ViaVersion:2.1.3-R1.5'
|
||||
implementation project(path: ":api")
|
||||
implementation 'com.djrapitops:Extension-AAC:4.4.2-R0.1'
|
||||
implementation 'com.djrapitops:Extension-AdvancedAchievements:6.4.0-R0.1'
|
||||
implementation 'com.djrapitops:Extension-AdvancedBan:2.1.5-R1.0'
|
||||
implementation 'com.djrapitops:Extension-ASkyBlock:3.0.9.4-R0.5'
|
||||
implementation 'com.djrapitops:Extension-AuthMe:5.6.0-R0.2'
|
||||
implementation 'com.djrapitops:Extension-BanManager:7.3.1-R0.2'
|
||||
implementation 'com.djrapitops:Extension-BentoBox:1.15.5-R1.0'
|
||||
implementation 'com.djrapitops:Extension-CoreProtect:2.16.0-R0.4'
|
||||
implementation 'com.djrapitops:Extension-DiscordSRV:1.18.0-R0.3'
|
||||
implementation 'com.djrapitops:Extension-DKBans:2.1.2-R0.3'
|
||||
implementation 'com.djrapitops:Extension-DKCoins:3.0.5-R0.1'
|
||||
implementation 'com.djrapitops:Extension-EssentialsX:2.15.0-R0.6'
|
||||
implementation 'com.djrapitops:Extension-Factions:2.14.0-R0.1'
|
||||
implementation 'com.djrapitops:Extension-FactionsUUID:1.6.9.5-U0.5.16-R0.2'
|
||||
implementation 'com.djrapitops:Extension-FastLogin:R0.1'
|
||||
implementation 'com.djrapitops:Extension-Floodgate:1.0-R1.2'
|
||||
implementation 'com.djrapitops:Extension-GriefDefender:R0.2'
|
||||
implementation 'com.djrapitops:Extension-GriefPrevention:16.11.6-R0.2'
|
||||
implementation 'com.djrapitops:Extension-GriefPrevention-Sponge:4.0.1-R0.2'
|
||||
implementation 'com.djrapitops:Extension-Heroes:R0.2'
|
||||
implementation 'com.djrapitops:Extension-Jobs:4.16.3-R0.1'
|
||||
implementation 'com.djrapitops:Extension-KingdomsX:1.10.17-R0.3'
|
||||
implementation 'com.djrapitops:Extension-Lands:5.4.12-R0.1'
|
||||
implementation 'com.djrapitops:Extension-Litebans:0.3.4-R0.1'
|
||||
implementation 'com.djrapitops:Extension-LogBlock:1.16.1.2-R0.2'
|
||||
implementation 'com.djrapitops:Extension-LuckPerms:5.0-R0.2'
|
||||
implementation 'com.djrapitops:Extension-MarriageMaster:2.3-R0.2'
|
||||
implementation 'com.djrapitops:Extension-McMMO:2.1.149-R1.5'
|
||||
implementation 'com.djrapitops:Extension-MinigamesLib:1.14.17-R0.2'
|
||||
implementation 'com.djrapitops:Extension-MyPet:3.10-R0.2'
|
||||
implementation 'com.djrapitops:Extension-Nucleus:2.3.0-R0.1'
|
||||
implementation 'com.djrapitops:Extension-nuVotifier:2.3.4-R0.3'
|
||||
implementation 'com.djrapitops:Extension-PlaceholderAPI:2.10.9-R0.3.2'
|
||||
implementation 'com.djrapitops:Extension-PlotSquared:5.13.11-R0.1'
|
||||
implementation 'com.djrapitops:Extension-ProtectionStones:2.8.2-R0.1'
|
||||
implementation 'com.djrapitops:Extension-ProtocolSupport:1.16.4-R0.1'
|
||||
implementation 'com.djrapitops:Extension-Quests:4.0.2-R0.3'
|
||||
implementation 'com.djrapitops:Extension-React:6.651-R0.1'
|
||||
implementation 'com.djrapitops:Extension-RedProtect:7.7.3-R0.1'
|
||||
implementation 'com.djrapitops:Extension-Sponge-Economy:7.1.0-R0.3'
|
||||
implementation 'com.djrapitops:Extension-SuperbVote:0.5.4-R0.1'
|
||||
implementation 'com.djrapitops:Extension-Tebex:R1.2'
|
||||
implementation 'com.djrapitops:Extension-Towny:0.96.7.4-R0.2'
|
||||
implementation 'com.djrapitops:Extension-Vault:1.7-R0.3'
|
||||
implementation 'com.djrapitops:Extension-ViaVersion:2.1.3-R1.5'
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
configurations = [project.configurations.compile]
|
||||
|
||||
dependencies {
|
||||
exclude(project(':api'))
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,6 +1,5 @@
|
|||
#Tue Mar 10 21:27:56 EET 2020
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ esac
|
|||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
|
|
@ -129,6 +130,7 @@ fi
|
|||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
|
@ -54,7 +54,7 @@ goto fail
|
|||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
|
|
@ -64,28 +64,14 @@ echo location of your Java installation.
|
|||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
|
|
|||
|
|
@ -1,18 +1,16 @@
|
|||
dependencies {
|
||||
compileOnly project(":common")
|
||||
compile project(path: ":common", configuration: 'shadow')
|
||||
implementation project(path: ":common", configuration: 'shadow')
|
||||
compileOnly project(":api")
|
||||
|
||||
compile "net.playeranalytics:platform-abstraction-layer-nukkit:$palVersion"
|
||||
implementation "net.playeranalytics:platform-abstraction-layer-nukkit:$palVersion"
|
||||
compileOnly "cn.nukkit:nukkit:$nukkitVersion"
|
||||
compileOnly "com.creeperface.nukkit.placeholderapi:PlaceholderAPI:$nkPlaceholderapiVersion"
|
||||
testCompile "cn.nukkit:nukkit:$nukkitVersion"
|
||||
testImplementation "cn.nukkit:nukkit:$nukkitVersion"
|
||||
|
||||
testCompile project(path: ":common", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":common", configuration: 'testArtifacts')
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
configurations = [project.configurations.compile]
|
||||
|
||||
relocate 'org.slf4j', 'plan.org.slf4j'
|
||||
}
|
||||
|
|
@ -1,21 +1,19 @@
|
|||
dependencies {
|
||||
compile project(path: ":common", configuration: 'shadow')
|
||||
compile project(path: ":bukkit", configuration: 'shadow')
|
||||
compile project(path: ":nukkit", configuration: 'shadow')
|
||||
compile project(path: ":sponge", configuration: 'shadow')
|
||||
compile project(path: ":bungeecord", configuration: 'shadow')
|
||||
compile project(path: ":velocity", configuration: 'shadow')
|
||||
testCompile project(path: ":common", configuration: 'testArtifacts')
|
||||
testCompile project(path: ":bukkit", configuration: 'testArtifacts')
|
||||
testCompile project(path: ":nukkit", configuration: 'testArtifacts')
|
||||
testCompile project(path: ":sponge", configuration: 'testArtifacts')
|
||||
testCompile project(path: ":bungeecord", configuration: 'testArtifacts')
|
||||
testCompile project(path: ":velocity", configuration: 'testArtifacts')
|
||||
implementation project(path: ":common", configuration: 'shadow')
|
||||
implementation project(path: ":bukkit", configuration: 'shadow')
|
||||
implementation project(path: ":nukkit", configuration: 'shadow')
|
||||
implementation project(path: ":sponge", configuration: 'shadow')
|
||||
implementation project(path: ":bungeecord", configuration: 'shadow')
|
||||
implementation project(path: ":velocity", configuration: 'shadow')
|
||||
testImplementation project(path: ":common", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":bukkit", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":nukkit", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":sponge", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":bungeecord", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":velocity", configuration: 'testArtifacts')
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
configurations = [project.configurations.compile]
|
||||
|
||||
relocate('org.apache', 'plan.org.apache') {
|
||||
exclude 'org/apache/logging/**'
|
||||
}
|
||||
|
|
@ -26,13 +24,13 @@ shadowJar {
|
|||
relocate 'javax.inject', 'plan.javax.inject'
|
||||
relocate 'com.github.benmanes', 'plan.com.github.benmanes'
|
||||
|
||||
destinationDir = file("$rootDir/builds/")
|
||||
baseName = "Plan"
|
||||
classifier = null
|
||||
}
|
||||
destinationDirectory.set(file("$rootDir/builds/"))
|
||||
archiveBaseName.set('Plan')
|
||||
archiveClassifier.set('')
|
||||
|
||||
build {
|
||||
dependsOn tasks.named("shadowJar")
|
||||
build {
|
||||
dependsOn tasks.named("shadowJar")
|
||||
}
|
||||
}
|
||||
|
||||
publishing {
|
||||
|
|
|
|||
|
|
@ -9,22 +9,20 @@ blossom {
|
|||
|
||||
dependencies {
|
||||
compileOnly project(":common")
|
||||
compile project(path: ":common", configuration: 'shadow')
|
||||
implementation project(path: ":common", configuration: 'shadow')
|
||||
compileOnly project(":api")
|
||||
|
||||
compile "net.playeranalytics:platform-abstraction-layer-sponge:$palVersion"
|
||||
compile "org.bstats:bstats-sponge:$bstatsVersion"
|
||||
implementation "net.playeranalytics:platform-abstraction-layer-sponge:$palVersion"
|
||||
implementation "org.bstats:bstats-sponge:$bstatsVersion"
|
||||
|
||||
compileOnly "org.spongepowered:spongeapi:$spongeVersion"
|
||||
testCompile "org.spongepowered:spongeapi:$spongeVersion"
|
||||
testImplementation "org.spongepowered:spongeapi:$spongeVersion"
|
||||
|
||||
annotationProcessor "org.spongepowered:spongeapi:$spongeVersion"
|
||||
|
||||
testCompile project(path: ":common", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":common", configuration: 'testArtifacts')
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
relocate 'org.bstats', 'com.djrapitops.plan.utilities.metrics'
|
||||
|
||||
configurations = [project.configurations.compile]
|
||||
}
|
||||
|
|
@ -9,23 +9,21 @@ blossom {
|
|||
|
||||
dependencies {
|
||||
compileOnly project(":common")
|
||||
compile project(path: ":common", configuration: 'shadow')
|
||||
implementation project(path: ":common", configuration: 'shadow')
|
||||
compileOnly project(":api")
|
||||
|
||||
compile "net.playeranalytics:platform-abstraction-layer-velocity:$palVersion"
|
||||
compile "org.bstats:bstats-velocity:$bstatsVersion"
|
||||
implementation "net.playeranalytics:platform-abstraction-layer-velocity:$palVersion"
|
||||
implementation "org.bstats:bstats-velocity:$bstatsVersion"
|
||||
|
||||
compileOnly "com.velocitypowered:velocity-api:$velocityVersion"
|
||||
testCompile "com.velocitypowered:velocity-api:$velocityVersion"
|
||||
testImplementation "com.velocitypowered:velocity-api:$velocityVersion"
|
||||
|
||||
annotationProcessor "com.velocitypowered:velocity-api:$velocityVersion"
|
||||
|
||||
testCompile project(path: ":common", configuration: 'testArtifacts')
|
||||
testImplementation project(path: ":common", configuration: 'testArtifacts')
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
dependsOn blossomSourceReplacementJava
|
||||
relocate 'org.bstats', 'com.djrapitops.plan.utilities.metrics'
|
||||
|
||||
configurations = [project.configurations.compile]
|
||||
}
|
||||
Loading…
Reference in New Issue