Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 12:35:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move org.json into core

Browse Source
This commit is contained in:
Alexander Söderberg 2020-04-11 02:28:15 +02:00
parent f9ea99fa1d
commit c196ced0e2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/build.gradle
View File

@ -4,6 +4,7 @@ repositories {
def textVersion = "3.0.2" def textVersion = "3.0.2"
dependencies { dependencies {
compile group: 'org.json', name: 'json', version: '20190722'
implementation("org.yaml:snakeyaml:1.25") implementation("org.yaml:snakeyaml:1.25")
implementation("com.google.code.gson:gson:2.8.6") { implementation("com.google.code.gson:gson:2.8.6") {
because("Minecraft uses GSON 2.8.0") because("Minecraft uses GSON 2.8.0")
@ -73,6 +74,7 @@ shadowJar {
include(dependency("net.kyori:text-serializer-legacy:3.0.2")) include(dependency("net.kyori:text-serializer-legacy:3.0.2"))
include(dependency("net.kyori:text-serializer-plain:3.0.2")) include(dependency("net.kyori:text-serializer-plain:3.0.2"))
} }
relocate("org.json", "com.github.intellectualsites.plotsquared.json")
relocate('net.kyori.text', 'com.github.intellectualsites.plotsquared.formatting.text') relocate('net.kyori.text', 'com.github.intellectualsites.plotsquared.formatting.text')
} }

1
build.gradle
View File

@ -83,7 +83,6 @@ subprojects {
exclude(module: "mockito-core") exclude(module: "mockito-core")
exclude(module: "dummypermscompat") exclude(module: "dummypermscompat")
} }
compile group: 'org.json', name: 'json', version: '20190722'
implementation("net.kyori:text-api:3.0.2") implementation("net.kyori:text-api:3.0.2")
implementation("net.kyori:text-serializer-gson:3.0.2") implementation("net.kyori:text-serializer-gson:3.0.2")