TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-23 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v5' of https://github.com/IntellectualSites/PlotSquared into v5

Browse source
This commit is contained in:
dordsor21 2020-05-14 14:19:37 +01:00
commit e1a25907f2
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Bukkit/build.gradle
View file

@ -16,9 +16,9 @@ repositories {
dependencies { dependencies {
implementation(project(":Core")) implementation(project(":PlotSquared"))
compile("org.bstats:bstats-bukkit:1.7") compile("org.bstats:bstats-bukkit:1.7")
compile(project(":Core")) compile(project(":PlotSquared"))
compile("com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT") compile("com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT")
//implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT' //implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT'
implementation("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT") implementation("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
@ -81,7 +81,7 @@ task copyFiles {
shadowJar { shadowJar {
dependencies { dependencies {
include(dependency(":Core")) include(dependency(":PlotSquared"))
include(dependency("io.papermc:paperlib:1.0.2")) include(dependency("io.papermc:paperlib:1.0.2"))
include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))
include(dependency("org.bstats:bstats-bukkit:1.7")) include(dependency("org.bstats:bstats-bukkit:1.7"))
@ -89,7 +89,7 @@ shadowJar {
relocate('net.kyori.text', 'com.plotsquared.formatting.text') relocate('net.kyori.text', 'com.plotsquared.formatting.text')
relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib") relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
relocate("org.bstats", "com.plotsquared.metrics") relocate("org.bstats", "com.plotsquared.metrics")
archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar" archiveFileName = "${project.name}-${parent.version}.jar"
destinationDirectory = file "../target" destinationDirectory = file "../target"
} }

4
Bukkit/pom.xml
View file

@ -20,8 +20,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.plotsquared</groupId> <groupId>com.plotsquared</groupId>
<artifactId>Core</artifactId> <artifactId>PlotSquared</artifactId>
<version>unspecified</version> <version>5.11.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

4
build.gradle
View file

@ -126,9 +126,11 @@ subprojects {
exclude "org/json/simple/**" exclude "org/json/simple/**"
} }
// relocate('org.mcstats', 'com.plotsquared.stats') // relocate('org.mcstats', 'com.plotsquared.stats')
archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar" archiveFileName = "${project.name}-${parent.version}.jar"
destinationDirectory = file "../target" destinationDirectory = file "../target"
} }
version = rootProject.version
} }
task aggregatedJavadocs(type: Javadoc, description: "Generate javadocs from all child projects as if it was a single project", group: "Documentation") { task aggregatedJavadocs(type: Javadoc, description: "Generate javadocs from all child projects as if it was a single project", group: "Documentation") {

3
settings.gradle
View file

@ -1,3 +1,6 @@
rootProject.name = 'PlotSquared' rootProject.name = 'PlotSquared'
include 'Core', 'Bukkit' // , 'Nukkit', 'Sponge' include 'Core', 'Bukkit' // , 'Nukkit', 'Sponge'
project(':Core').name = 'PlotSquared'
project(':Bukkit').name = 'PlotSquared-Bukkit'