Move project.gradle scripts back to Groovy DSL

Author: kb-1000

build.gradle.kts

@@ -1,18 +1,16 @@
 import java.io.ByteArrayOutputStream
 
 plugins {
-	id("com.parzivail.internal.pswg-submodule-dependencies")
-	id("fabric-loom")
-	id("io.github.juuxel.loom-vineflower")
+	id("com.parzivail.internal.pswg-submodule-dependencies") version "0.1"
+	id("fabric-loom") version "1.4-SNAPSHOT"
 	`maven-publish`
 }
 
 subprojects {
-	if (!file("project.gradle.kts").exists()) return@subprojects
+	if (!file("project.gradle").exists()) return@subprojects
 
 	apply(plugin = "com.parzivail.internal.pswg-submodule-dependencies")
 	apply(plugin = "fabric-loom")
-	apply(plugin = "io.github.juuxel.loom-vineflower")
 	apply(plugin = "maven-publish")
 }
 
@@ -53,7 +51,7 @@ allprojects {
 		options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000", "-Xdiags:verbose"))
 	}
 
-	if (!file("project.gradle.kts").exists()) return@allprojects
+	if (!file("project.gradle").exists()) return@allprojects
 
 	repositories {
 		mavenCentral()
@@ -97,10 +95,6 @@ allprojects {
 		withSourcesJar()
 	}
 
-	vineflower {
-		toolVersion = "1.9.3"
-	}
-
 	if (project.parent != null)
 		base.archivesName = if (project.name.startsWith(archives_base_name)) project.name else "$archives_base_name-${project.name}"
 	version = versionName
@@ -149,7 +143,7 @@ allprojects {
 		}
 	}
 
-	apply(from = "project.gradle.kts")
+	apply(from = "project.gradle")
 }
 
 tasks.assemble {

buildSrc/build.gradle.kts

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -0,0 +1,3 @@
+dependencies {
+	runtimeOnly(project(path: ":projects:pswg", configuration: "namedElements"))
+}

project.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    api(project(path: ":projects:pswg", configuration: "namedElements"))
+}

project.gradle.kts

@@ -0,0 +1,3 @@
+dependencies {
+    api(project(path: ":projects:pswg", configuration: "namedElements"))
+}

projects/addon-clonewars/project.gradle

@@ -0,0 +1,41 @@
+loom {
+	accessWidenerPath.set(file("src/main/resources/pswg.accesswidener"))
+}
+
+dependencies {
+	compileOnly(project(":projects:tarkin-api"))
+
+	// CCA Base
+	modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${cca_version}")
+	include("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${cca_version}")
+	// CCA Entity
+	modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${cca_version}")
+	include("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${cca_version}")
+
+	// Cloth Config
+	modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") {
+		exclude(group: "net.fabricmc.fabric-api")
+	}
+	include("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}")
+
+	// Mod Menu
+	modImplementation("com.terraformersmc:modmenu:${modmenu_version}")
+
+	// LambDynamicLights
+	modCompileOnly("dev.lambdaurora:lambdynamiclights:${lambdynamiclights_version}")
+
+	// Roughly Enough Items
+	modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:${rei_version}")
+	modRuntimeOnly("me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}")
+
+	// LibZoomer
+	modImplementation("com.parzivail.internal:LibZoomer:${libzoomer_version}")
+	include("com.parzivail.internal:LibZoomer:${libzoomer_version}")
+
+	// Trinkets
+	modImplementation("dev.emi:trinkets:${trinkets_version}")
+	include("dev.emi:trinkets:${trinkets_version}")
+
+	// Gravity Changer
+	modCompileOnly("maven.modrinth:gravity-api:${gravity_changer_version}")
+}

projects/addon-clonewars/project.gradle.kts

@@ -0,0 +1,15 @@
+dependencies {
+	api(project(path: ":projects:pswg", configuration: "namedElements"))
+	api(project(path: ":projects:addon-clonewars", configuration: "namedElements"))
+	api(project(":projects:tarkin-api"))
+
+	// Cloth Config
+	modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") {
+		exclude(group: "net.fabricmc.fabric-api")
+	}
+	include("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}")
+
+	// Trinkets
+	modImplementation("dev.emi:trinkets:${trinkets_version}")
+	include("dev.emi:trinkets:${trinkets_version}")
+}

projects/addon-test/project.gradle

@@ -0,0 +1,28 @@
+repositories {
+	maven {
+		url = "https://maven.wispforest.io/"
+		name = "WispForest"
+	}
+}
+
+dependencies {
+	api(project(path: ":projects:pswg", configuration: "namedElements"))
+
+	modImplementation("org.objenesis:objenesis:3.2")
+	include("org.objenesis:objenesis:3.2")
+
+	modImplementation("io.github.kostaskougios:cloning:1.10.3")
+	include("io.github.kostaskougios:cloning:1.10.3")
+
+	modImplementation("io.github.spair:imgui-java-binding:1.86.11")
+	include("io.github.spair:imgui-java-binding:1.86.11")
+	modImplementation("io.github.spair:imgui-java-lwjgl3:1.86.11")
+	include("io.github.spair:imgui-java-lwjgl3:1.86.11")
+	modImplementation("io.github.spair:imgui-java-natives-windows-ft:1.86.11")
+	include("io.github.spair:imgui-java-natives-windows-ft:1.86.11")
+
+	modImplementation("io.wispforest:worldmesher:0.4.2+1.20")
+	include("io.wispforest:worldmesher:0.4.2+1.20")
+	//	"modImplementation"(files("/home/cnewman/IdeaProjects/worldmesher/build/libs/worldmesher-0.2.13+build.11+1.19.jar"))
+	//	"include"(files("/home/cnewman/IdeaProjects/worldmesher/build/libs/worldmesher-0.2.13+build.11+1.19.jar"))
+}