From 8c15cdf7cb0f574c386fee4443039cb1f11d0ead Mon Sep 17 00:00:00 2001 From: extendedclip Date: Fri, 31 Jul 2020 10:42:24 -0400 Subject: [PATCH] remove JSONMessage repo, Update archive file name and license stuff --- build.gradle | 21 +++++++++++---------- headers/jsonmessage.txt | 7 +++++++ headers/{header.txt => main.txt} | 0 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 headers/jsonmessage.txt rename headers/{header.txt => main.txt} (100%) diff --git a/build.gradle b/build.gradle index 721f996..e424450 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,7 @@ description "An awesome placeholder provider!" repositories { mavenCentral() - - maven({ url = "https://rayzr.dev/repo/" }) + maven({ url = "https://repo.codemc.org/repository/maven-public" }) maven({ url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }) } @@ -21,7 +20,6 @@ repositories { dependencies { implementation "com.google.code.gson:gson:2.8.6" implementation "org.bstats:bstats-bukkit:1.5" - implementation "me.rayzr522:jsonmessage:1.2.1" compileOnly "org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" compileOnly "org.jetbrains:annotations:19.0.0" @@ -48,20 +46,23 @@ tasks.withType(JavaCompile) { shadowJar { archiveClassifier.set("") - + archiveFileName = "PlaceholderAPI-${project.version}.jar" relocate "org.bstats", "me.clip.placeholderapi.metrics" relocate "com.google.gson", "me.clip.placeholderapi.libs.gson" - relocate "me.rayzr522.jsonmessage", "me.clip.placeholderapi.libs.jsonmessage" } license { - header = file("headers/header.txt") - + matching('**/*.java') { + header = file('headers/main.txt') + } + + matching('**/JSONMessage.java') { + header = file('headers/jsonmessage.txt') + } + ext { year = 2020 } - - include "**/*.java" } test { @@ -92,7 +93,7 @@ publishing { publications { mavenJava(MavenPublication) { from components.java - + pom.withXml { asNode().appendNode("packaging", "jar") asNode().remove(asNode().get("dependencies")) diff --git a/headers/jsonmessage.txt b/headers/jsonmessage.txt new file mode 100644 index 0000000..ec15330 --- /dev/null +++ b/headers/jsonmessage.txt @@ -0,0 +1,7 @@ +Copyright (c) 2018-2020 Peter Blood + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/headers/header.txt b/headers/main.txt similarity index 100% rename from headers/header.txt rename to headers/main.txt