Reorganised build gradle a bit

1 files changed, 36 insertions, 35 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index b4bd891..3c5b89e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,13 +13,13 @@ val patchouliVersion: String by project
 val quiltMappings: String by project
 val quiltedFabricApiVersion: String by project
 
+group = groupid
+version = "${modVersion}+${minecraftVersion}"
+
 base {
     archivesName = modid
 }
 
-group = groupid
-version = "${modVersion}+${minecraftVersion}"
-
 repositories {
     maven {
         url = uri("https://maven.blamejared.com")
@@ -53,6 +53,34 @@ dependencies {
     compileOnly("jakarta.annotation:jakarta.annotation-api:${jakartaAnnotationVersion}")
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+
+    withJavadocJar()
+    withSourcesJar()
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            artifactId = modid
+            from(components["java"])
+        }
+    }
+
+    repositories {
+        maven {
+            url = uri("https://mvn.enes.lv/")
+            credentials {
+                username = (findProperty("mvnUsername") ?: System.getenv("MVN_USERNAME")).toString()
+                password = (findProperty("mvnPassword") ?: System.getenv("MVN_PASSWORD")).toString()
+            }
+        }
+    }
+}
+
 tasks.processResources {
     inputs.property("loader_version", loaderVersion)
     inputs.property("minecraft_version", minecraftVersion)
@@ -62,11 +90,11 @@ tasks.processResources {
 
     filesMatching("quilt.mod.json") {
         expand(
-                "loader_version" to loaderVersion,
-                "minecraft_version" to minecraftVersion,
-                "patchouli_version" to patchouliVersion,
-                "quilted_fabric_api_version" to quiltedFabricApiVersion,
-                "version" to version
+            "loader_version" to loaderVersion,
+            "minecraft_version" to minecraftVersion,
+            "patchouli_version" to patchouliVersion,
+            "quilted_fabric_api_version" to quiltedFabricApiVersion,
+            "version" to version
         )
     }
 }
@@ -76,14 +104,6 @@ tasks.withType<JavaCompile>().configureEach {
     options.release = 17
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-
-    withJavadocJar()
-    withSourcesJar()
-}
-
 tasks.javadoc {
     (options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
 }
@@ -93,22 +113,3 @@ tasks.jar {
         rename { "${it}_${base.archivesName.get()}" }
     }
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            artifactId = modid
-            from(components["java"])
-        }
-    }
-
-    repositories {
-        maven {
-            url = uri("https://mvn.enes.lv/")
-            credentials {
-                username = (findProperty("mvnUsername") ?: System.getenv("MVN_USERNAME")).toString()
-                password = (findProperty("mvnPassword") ?: System.getenv("MVN_PASSWORD")).toString()
-            }
-        }
-    }
-}