Finish migration

AlexProgrammerDE · Dec 29, 2021 · db9acc4 · db9acc4
1 parent 0685cc5
commit db9acc4
Show file tree

Hide file tree

Showing 29 changed files with 39 additions and 1,044 deletions.
diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt
@@ -0,0 +1,11 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.named
+
+fun Project.setupVersion(versionNumber: String) {
+    tasks.named<ShadowJar>("shadowJar").get().apply {
+        relocate("com.github.steveice10", "com.github.steveice10.$versionNumber") {
+            exclude("com.github.steveice10.mc.auth.data.GameProfile")
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/sw.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/sw.shadow-conventions.gradle.kts
@@ -1,5 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
     id("sw.java-conventions")
     id("com.github.johnrengelman.shadow")
@@ -17,15 +15,9 @@ tasks {
 
     shadowJar {
         minimize()
-        configureRelocations()
     }
 
     build {
         dependsOn(shadowJar)
     }
 }
-
-fun ShadowJar.configureRelocations() {
-}
-
-// publishShadowJar()
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -15,3 +15,7 @@ dependencies {
     implementation("net.kyori:adventure-text-serializer-plain:4.9.3")
     implementation("net.kyori:adventure-text-serializer-gson:4.9.3")
 }
+
+tasks.named<Jar>("jar").get().manifest {
+    attributes["Main-Class"] = "net.pistonmaster.serverwrecker.Main"
+}
diff --git a/core/pom.xml b/core/pom.xml
diff --git a/pom.xml b/pom.xml
diff --git a/version_1_10/build.gradle.kts b/version_1_10/build.gradle.kts
@@ -6,3 +6,5 @@ dependencies {
     implementation("com.github.AlexProgrammerDE:MCProtocolLib:1.10-SNAPSHOT")
     compileOnly(projects.serverwreckerCommon)
 }
+
+setupVersion("v1_10")
diff --git a/version_1_10/pom.xml b/version_1_10/pom.xml
diff --git a/version_1_11/build.gradle.kts b/version_1_11/build.gradle.kts
@@ -6,3 +6,5 @@ dependencies {
     implementation("com.github.AlexProgrammerDE:MCProtocolLib:1.11-SNAPSHOT")
     compileOnly(projects.serverwreckerCommon)
 }
+
+setupVersion("v1_11")