From 81b0f64cd7ff40c6cdf6dbed71763fa71d6cd683 Mon Sep 17 00:00:00 2001
From: NyCodeGHG <nycode@protonmail.com>
Date: Tue, 23 Mar 2021 18:07:00 +0100
Subject: [PATCH] Fix anvilgui dependency

---
 build.gradle.kts | 86 +++++++++++-------------------------------------
 1 file changed, 19 insertions(+), 67 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4810efa2..be08a7b8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,50 +2,34 @@
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-/*
- * BUILD CONSTANTS
- */
-
 val GITHUB_REPO = "bluefireoly/KSpigot"
 
-val JVM_VERSION = JavaVersion.VERSION_1_8
-val JVM_VERSION_STRING = JVM_VERSION.versionString
-
-/*
- * PROJECT
- */
+val jvmVersion = JavaVersion.VERSION_1_8
+val jvmVersionString = jvmVersion.majorVersion.let {
+    val version = it.toInt()
+    if (version <= 10) "1.$it" else it
+}
 
 group = "net.axay"
-version = "1.16.24"
+version = "1.16.25"
 
 description = "A Kotlin API for the Minecraft Server Software \"Spigot\"."
 
-/*
- * PLUGINS
- */
-
 plugins {
+    kotlin("jvm") version "1.4.31"
 
     `java-library`
-
-    kotlin("jvm") version "1.4.30"
-
     `maven-publish`
     signing
 
-    id("org.jetbrains.dokka") version "1.4.20"
-
-    kotlin("plugin.serialization") version "1.4.21"
-
+    id("org.jetbrains.dokka") version "1.4.30"
+    kotlin("plugin.serialization") version "1.4.31"
 }
 
-/*
- * DEPENDENCY MANAGEMENT
- */
-
 repositories {
     jcenter()
     maven("https://jitpack.io")
+    maven(" https://repo.codemc.io/repository/maven-snapshots/")
 
     mavenLocal() // to get the locally available binaries of spigot (use the BuildTools)
 }
@@ -56,30 +40,21 @@ dependencies {
     compileOnly("org.spigotmc", "spigot", "1.16.5-R0.1-SNAPSHOT")
     testCompileOnly("org.spigotmc", "spigot", "1.16.5-R0.1-SNAPSHOT")
 
-    // KHTTP
-    api("khttp", "khttp", "1.0.0")
-
-    // ANVIL GUI
-    api("com.github.WesJD.AnvilGUI", "anvilgui", "master-SNAPSHOT")
-
-    // KOTLINX
-    // serialization
-    api("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.0.1")
-
+    api("net.wesjd", "anvilgui", "1.5.0-SNAPSHOT")
+    api("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.1.0")
+    api("org.json", "json", "20210307")
 }
 
-/*
- * BUILD
- */
-
-java.sourceCompatibility = JVM_VERSION
-java.targetCompatibility = JVM_VERSION
+java.sourceCompatibility = jvmVersion
+java.targetCompatibility = jvmVersion
 
 tasks {
     compileKotlin.configureJvmVersion()
     compileTestKotlin.configureJvmVersion()
 }
 
+fun TaskProvider<KotlinCompile>.configureJvmVersion() { get().kotlinOptions.jvmTarget = jvmVersionString }
+
 java {
     withSourcesJar()
     withJavadocJar()
@@ -89,24 +64,16 @@ tasks.dokkaHtml.configure {
     outputDirectory.set(projectDir.resolve("docs"))
 }
 
-/*
- * PUBLISHING
- */
-
 publishing {
-
     repositories {
         maven("https://oss.sonatype.org/service/local/staging/deploy/maven2") {
-            credentials {
-                username = property("ossrh.username") as String
-                password = property("ossrh.password") as String
-            }
+            name = "ossrh"
+            credentials(PasswordCredentials::class)
         }
     }
 
     publications {
         create<MavenPublication>(project.name) {
-
             from(components["java"])
 
             this.groupId = project.group.toString()
@@ -114,7 +81,6 @@ publishing {
             this.version = project.version.toString()
 
             pom {
-
                 name.set(project.name)
                 description.set(project.description)
 
@@ -137,25 +103,11 @@ publishing {
                     connection.set("scm:git:git://github.com/${GITHUB_REPO}.git")
                     url.set("https://github.com/${GITHUB_REPO}/tree/main")
                 }
-
             }
-
         }
     }
-
 }
 
 signing {
     sign(publishing.publications)
 }
-
-/*
- * EXTENSIONS
- */
-
-val JavaVersion.versionString get() = majorVersion.let {
-    val version = it.toInt()
-    if (version <= 10) "1.$it" else it
-}
-
-fun TaskProvider<KotlinCompile>.configureJvmVersion() { get().kotlinOptions.jvmTarget = JVM_VERSION_STRING }