[dev/mapping-tool] Gradle 7.0.2 and updated dependencies (#493)

* [dev/mapping-tool] Gradle 7.0.2 and updated dependencies

+ ported mapper build.gradle to build.gradle.kts

* fix link

* Fixed all deprecations

* done , ready to merge

buildSrc/build.gradle.kts

@@ -1,7 +1,11 @@
 val kotlinxDomVersion = "0.0.10"
 val shadowVersion = "7.0.0"
-val mustacheVersion = "0.9.6"
-val javaxMailVersion = "1.4.4"
+val mustacheVersion = "0.9.7"
+val javaxMailVersion = "1.6.2"
+val jbsdiffVersion = "deff66b794"
+val gsonVersion = "2.8.6"
+val guavaVersion = "30.1.1-jre"
+val commonsioVersion = "2.8.0"
 
 plugins {
     `kotlin-dsl`
@@ -17,11 +21,11 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx.dom:$kotlinxDomVersion")
     implementation("com.github.johnrengelman:shadow:$shadowVersion")
     implementation("com.github.spullara.mustache.java:compiler:$mustacheVersion")
-    implementation("javax.mail:mail:$javaxMailVersion")
-    implementation("com.github.ishlandbukkit:jbsdiff:deff66b794")
-    implementation("com.google.code.gson:gson:2.8.6")
-    implementation("com.google.guava:guava:30.0-jre")
-    implementation("commons-io:commons-io:2.8.0")
+    implementation("javax.mail:javax.mail-api:$javaxMailVersion")
+    implementation("com.github.ishlandbukkit:jbsdiff:$jbsdiffVersion")
+    implementation("com.google.code.gson:gson:$gsonVersion")
+    implementation("com.google.guava:guava:$guavaVersion")
+    implementation("commons-io:commons-io:$commonsioVersion")
 }
 
 tasks.withType<JavaCompile> {

buildSrc/src/main/kotlin/task/Paperclip.kt

@@ -12,6 +12,7 @@ import toothpick
 internal fun Project.createPaperclipTask(
     receiver: Task.() -> Unit = {}
 ): Task = tasks.create("paperclip") {
+    dependsOn(":yatopia-server:jar")
     receiver(this)
     group = taskGroup
     doLast {

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 # Check on https://gradle.org/release-checksums/
-distributionSha256Sum=dccda8aa069563c8ba2f6cdfd0777df0e34a5b4d15138ca8b9757e94f4e8a8cb
+distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mappings/mapper/build.gradle

@@ -1,27 +0,0 @@
-plugins {
-    id 'java'
-    id 'application'
-}
-
-repositories {
-	maven {
-		name = "Fabric"
-		url = 'https://maven.fabricmc.net/'
-	}
-    jcenter()
-}
-
-dependencies {
-    // This dependency is used by the application.
-    implementation 'com.google.guava:guava:30.1.1-jre'
-
-	// srg management
-	implementation 'org.cadixdev:lorenz:0.5.7'
-
-    // source code remapping
-    implementation 'org.cadixdev:mercury:0.1.0.fabric-SNAPSHOT'
-}
-
-application {
-    mainClassName = 'mapper.Main'
-}

mappings/mapper/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    id("java")
+    id("application")
+}
+
+repositories {
+	maven {
+		name = "Fabric"
+		url = uri("https://maven.fabricmc.net/")
+	}
+mavenCentral()
+}
+
+dependencies {
+    // This dependency is used by the application.
+    implementation("com.google.guava:guava:30.1.1-jre")
+
+    // srg management
+    implementation("org.cadixdev:lorenz:0.5.7")
+
+    // source code remapping
+    implementation("org.cadixdev:mercury:0.1.0.fabric-SNAPSHOT")
+}
+
+application {
+    mainClass.set("mapper.Main")
+}

mappings/mapper/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 # Check on https://gradle.org/release-checksums/
-distributionSha256Sum=dccda8aa069563c8ba2f6cdfd0777df0e34a5b4d15138ca8b9757e94f4e8a8cb
+distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mappings/mapper/settings.gradle.kts

@@ -4,7 +4,7 @@
  * The settings file is used to specify which projects to include in your build.
  *
  * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/6.5.1/userguide/multi_project_builds.html
+ * in the user manual at https://docs.gradle.org/7.0.2/userguide/multi_project_builds.html
  */
 
-rootProject.name = 'mapper'
+rootProject.name = "mapper"