Revert "simplify dependency setup for publishing"

This reverts commit 322348e.
Erdragh · Oct 11, 2023 · b8ecd71 · b8ecd71
1 parent 3313bb0
commit b8ecd71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/gradle/publishing/curseforge.gradle b/gradle/publishing/curseforge.gradle
@@ -10,14 +10,10 @@ curseforge {
 		addGameVersion(minecraft_version)
 
 		relations {
-			for (dependency in (depends as List<String>)) {
-				var optionalDep = dependency.endsWith("?")
-				if (optionalDep) {
-					optionalDependency(dependency.replace("?", ""))
-				} else {
-					requiredDependency(dependency)
-				}
-			}
+			requiredDependency("fabric-api")
+			requiredDependency("fabric-language-kotlin")
+			requiredDependency("forge-config-api-port-fabric")
+			optionalDependency("roughly-enough-items")
 		}
 
 		// https://github.com/mraliscoder/plasmo-voice/blob/41243bc77589d975acde5385dd86414b1c92a2a8/fabric/build.gradle.kts#L173

diff --git a/gradle/publishing/modrinth.gradle b/gradle/publishing/modrinth.gradle
@@ -10,14 +10,10 @@ modrinth {
 	gameVersions = [ minecraft_version ]
 	loaders = ["fabric"]
 	dependencies {
-		for (dependency in (depends as List<String>)) {
-			var optionalDep = dependency.endsWith("?")
-			if (optionalDep) {
-				optional.project(dependency.replace("?", ""))
-			} else {
-				required.project(dependency)
-			}
-		}
+		required.project "fabric-api"
+		required.project "fabric-language-kotlin"
+		required.project "forge-config-api-port"
+		optional.project "rei"
 	}
 }
 

diff --git a/gradle/publishing/publishing.gradle b/gradle/publishing/publishing.gradle
@@ -4,8 +4,6 @@ ext /*-ra properties*/ {
 	Properties properties = new Properties()
 	properties.load(new FileInputStream(file("gradle/publishing/publishing.properties")))
 
-	depends = ((String) properties.get("dependencies"))?.split("; *")
-
 	properties.forEach ((k, v) -> set(k, v))
 
 	version_valid = versionValidForPublishing(version)
@@ -32,17 +30,6 @@ tasks.register("printVersion") {
 	println(version)
 }
 
-tasks.register("printDependencies") {
-	for (dependency in (depends as List<String>)) {
-		var optionalDep = dependency.endsWith("?")
-		if (optionalDep) {
-			println("optional: " + dependency);
-		} else {
-			println("required: " + dependency);
-		}
-	}
-}
-
 static String makeName(String version, String minecraftVersion, String displayName) {
 	String projectVersion = "v" + version.split("-build")[0].replace("-", ".")
 	String rawPatch = System.getenv("PATCH_NUMBER")

diff --git a/gradle/publishing/publishing.properties b/gradle/publishing/publishing.properties
@@ -2,4 +2,3 @@ modrinth_id = 4Q5DgkRU
 curseforge_id = 833210
 release_type = release
 changelog_file = CHANGELOG.md
-dependencies = ad-astra;fabric-api;forge-config-api-port