Improve Gradle build script

Hantonik · Aug 29, 2024 · 50d981c · 50d981c
1 parent 4a1e8b2
commit 50d981c
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,13 +29,6 @@ subprojects {
             apply plugin: 'net.darkhax.curseforgegradle'
             apply plugin: 'com.modrinth.minotaur'
 
-            java {
-                withSourcesJar()
-
-                sourceCompatibility = JavaVersion."VERSION_$java_version"
-                targetCompatibility = JavaVersion."VERSION_$java_version"
-            }
-
             evaluationDependsOn(':Common')
         }
 
@@ -44,7 +37,14 @@ subprojects {
         apply plugin: 'idea'
         apply plugin: 'maven-publish'
 
-        java.toolchain.languageVersion = JavaLanguageVersion.of(java_version)
+        java {
+            toolchain.languageVersion = JavaLanguageVersion.of(java_version)
+
+            withSourcesJar()
+
+            sourceCompatibility = JavaVersion."VERSION_$java_version"
+            targetCompatibility = JavaVersion."VERSION_$java_version"
+        }
 
         idea {
             module {
@@ -57,6 +57,12 @@ subprojects {
     version = gradleutils.version.toString()
     group = "hantonik.$mod_id"
 
+    tasks.withType(JavaCompile).configureEach {
+        source project(':Common').sourceSets.main.allSource
+
+        options.encoding = 'UTF-8'
+    }
+
     tasks.withType(ProcessResources).configureEach {
         from project(':Common').sourceSets.main.resources
 
@@ -76,12 +82,6 @@ subprojects {
         }
     }
 
-    tasks.withType(JavaCompile).configureEach {
-        source project(':Common').sourceSets.main.allSource
-
-        options.encoding = 'UTF-8'
-    }
-
     tasks.withType(Jar).configureEach {
         manifest {
             attributes([