Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 32 additions & 15 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// tl;dr, tells us off for using properties for versions. Too bad, we don't like trawling this file for version numbers.
@file:Suppress("GradlePackageVersionRange")

import babric.SubprojectHelpers.addDependencyXML
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addDependencyXML

plugins {
id("maven-publish")
id("fabric-loom") version "1.9-SNAPSHOT"
id("babric-loom-extension") version "1.9.4"
id("babric-loom-extension") version "1.9.2"
}

// https://stackoverflow.com/a/40101046 - Even with kotlin, gradle can't get it's shit together.
Expand Down Expand Up @@ -40,7 +40,13 @@ allprojects {
}

configurations {
val transitiveImplementation = create("transitiveImplementation")
implementation.get().extendsFrom(transitiveImplementation)

// Required cause loom 0.14 for some reason doesn't remove asm-all 4.1. Ew.
all {
exclude(group = "org.ow2.asm", module = "asm-debug-all")
exclude(group = "org.ow2.asm", module = "asm-all")
exclude(group = "babric")
}
}
Expand All @@ -60,16 +66,16 @@ allprojects {

modImplementation("net.fabricmc:fabric-loader:${project.properties["loader_version"]}")

transitiveImplementation(modImplementation("org.apache.commons:commons-lang3:3.12.0") as Dependency)
transitiveImplementation(modImplementation("commons-io:commons-io:2.11.0") as Dependency)
transitiveImplementation(modImplementation("net.jodah:typetools:${project.properties["typetools_version"]}") as Dependency)
transitiveImplementation(modImplementation("com.github.mineLdiver:UnsafeEvents:${project.properties["unsafeevents_version"]}") as Dependency)
transitiveImplementation(modImplementation("it.unimi.dsi:fastutil:${project.properties["fastutil_version"]}") as Dependency)
transitiveImplementation(modImplementation("com.github.ben-manes.caffeine:caffeine:${project.properties["caffeine_version"]}") as Dependency)
transitiveImplementation(modImplementation("com.mojang:datafixerupper:${project.properties["dfu_version"]}") as Dependency)
transitiveImplementation(modImplementation("maven.modrinth:spasm:${project.properties["spasm_version"]}") as Dependency)
transitiveImplementation(modImplementation("me.carleslc:Simple-Yaml:1.8.4") as Dependency)
transitiveImplementation(modImplementation("net.glasslauncher.mods:GlassConfigAPI:${project.properties["gcapi_version"]}") as Dependency)
"transitiveImplementation"("org.apache.commons:commons-lang3:3.12.0")
"transitiveImplementation"("commons-io:commons-io:2.11.0")
"transitiveImplementation"("net.jodah:typetools:${project.properties["typetools_version"]}")
"transitiveImplementation"("com.github.mineLdiver:UnsafeEvents:${project.properties["unsafeevents_version"]}")
"transitiveImplementation"("it.unimi.dsi:fastutil:${project.properties["fastutil_version"]}")
"transitiveImplementation"("com.github.ben-manes.caffeine:caffeine:${project.properties["caffeine_version"]}")
"transitiveImplementation"("com.mojang:datafixerupper:${project.properties["dfu_version"]}")
"transitiveImplementation"("maven.modrinth:spasm:${project.properties["spasm_version"]}")
"transitiveImplementation"("me.carleslc:Simple-Yaml:1.8.4")
"transitiveImplementation"("net.glasslauncher.mods:GlassConfigAPI:${project.properties["gcapi_version"]}")

// convenience stuff
// adds some useful annotations for data classes. does not add any dependencies
Expand Down Expand Up @@ -159,9 +165,20 @@ allprojects {
artifact(tasks.getByName("remapJar")).builtBy(tasks.getByName("remapJar"))
artifact(tasks.getByName("remapSourcesJar")).builtBy(tasks.getByName("remapJar"))
}
// Remove this once I fix a **weird** edge case bug in babric.
pom.withXml {
this.asNode().appendNode("dependencies")

pom {
withXml {
// Wipes dependency block, cause it's just hopelessly wrong, and also includes floader for some reason
val depsNode = asNode().appendNode("dependencies")
// Jank solution to an annoying issue
configurations.getByName("transitiveImplementation").dependencies.forEach {
val depNode = depsNode.appendNode("dependency")
depNode.appendNode("groupId", it.group)
depNode.appendNode("artifactId", it.name)
depNode.appendNode("version", it.version)
depNode.appendNode("scope", "compile")
}
}
}
}
}
Expand Down
59 changes: 59 additions & 0 deletions buildSrc/src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* This file is part of fabric-loom, licensed under the MIT License (MIT).
*
* Copyright (c) 2016-2021 FabricMC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package net.fabricmc.loom.util;

import groovy.util.Node;
import groovy.xml.QName;

public final class GroovyXmlUtil {
private GroovyXmlUtil() { }

public static Node getOrCreateNode(Node parent, String name) {
for (Object object : parent.children()) {
if (object instanceof Node node && isSameName(node.name(), name)) {
return node;
}
}

return parent.appendNode(name);
}

private static boolean isSameName(Object nodeName, String givenName) {
if (nodeName instanceof String) {
return nodeName.equals(givenName);
}

if (nodeName instanceof QName qName) {
return qName.matches(givenName);
}

// New groovy 3 (gradle 7) class
if (nodeName instanceof groovy.namespace.QName qName) {
return qName.matches(givenName);
}

throw new UnsupportedOperationException("Cannot determine if " + nodeName.getClass() + " is the same as a String");
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,58 @@
package net.modificationstation.stationapi.gradle;

import groovy.util.Node;
import groovy.util.NodeList;
import groovy.xml.XmlUtil;
import net.fabricmc.loom.util.GroovyXmlUtil;
import org.gradle.api.Project;
import org.gradle.api.XmlProvider;
import org.gradle.api.artifacts.Dependency;
import org.gradle.api.publish.PublishingExtension;
import org.gradle.api.publish.maven.MavenPublication;
import org.gradle.internal.impldep.org.codehaus.plexus.util.xml.XmlReader;

import java.util.*;
import java.util.stream.*;

public class SubprojectHelpers {


public static void addModuleDependencies(Project project, String... projectNames) {
List<Dependency> modules = Arrays.stream(projectNames).map((it) -> project.getDependencies().project(Map.of("path", ":" + it, "configuration", "dev"))).collect(Collectors.toList());
// Arrays.stream(projectNames).forEach((it) -> project.getDependencies().project(Map.of("path", ":" + it, "configuration", "dev")));

modules.forEach(dependency -> project.getDependencies().add("implementation", dependency));

MavenPublication publishing = (MavenPublication) project.getExtensions().getByType(PublishingExtension.class).getPublications().getByName("mavenJava");
publishing.pom((e) -> e.withXml((f) -> {
addDependencies(f.asNode(), "implementation", modules);
}));
}

public static void addDependencyXML(Node xml, String scope, Project dependency) {
Node depsNode = GroovyXmlUtil.getOrCreateNode(xml, "dependencies");

Node appNode = depsNode.appendNode("dependency");
appNode.appendNode("groupId", dependency.getGroup());
appNode.appendNode("artifactId", dependency.getName());
appNode.appendNode("version", dependency.getVersion());
appNode.appendNode("scope", scope);
}

public static void addDependencies(Node xml, String scope, List<Dependency> dependencies) {
Node depsNode = GroovyXmlUtil.getOrCreateNode(xml, "dependencies");

for (Dependency dep : dependencies) {
Node appNode = depsNode.appendNode("dependency");
appNode.appendNode("groupId", dep.getGroup());
appNode.appendNode("artifactId", dep.getName());
appNode.appendNode("version", dep.getVersion());
appNode.appendNode("scope", scope);
}
}

public static String getSubprojectVersion(Project project, String ver) {
return project.getProperties().get("mod_version") + "-" + ver;
}

}
2 changes: 1 addition & 1 deletion station-achievements-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies

base.archivesName.set("station-achievements-v0")
version = getSubprojectVersion(project, "1.0.0")
Expand Down
2 changes: 1 addition & 1 deletion station-armor-api-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies

base.archivesName.set("station-armor-api-v0")
version = getSubprojectVersion(project, "1.0.0")
Expand Down
2 changes: 1 addition & 1 deletion station-audio-loader-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-audio-loader-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-biome-events-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-biome-events-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-blockentities-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-blockentities-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-blockitems-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-blockitems-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-blocks-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-blocks-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-container-api-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-container-api-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-datafixer-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-datafixer-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-dimensions-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-dimensions-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-effects-api-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion

base.archivesName.set("station-effects-api-v0")
Expand Down
2 changes: 1 addition & 1 deletion station-entities-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-entities-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-flattening-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-flattening-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-gui-api-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-gui-api-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-items-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion

base.archivesName.set("station-items-v0")
Expand Down
2 changes: 1 addition & 1 deletion station-keybindings-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-keybindings-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-lifecycle-events-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-lifecycle-events-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-localization-api-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-localization-api-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-maths-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-maths-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-nbt-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-nbt-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-networking-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-networking-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-player-api-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-player-api-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-recipes-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-recipes-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-registry-api-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-registry-api-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-registry-sync-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-registry-sync-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-renderer-api-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-renderer-api-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-renderer-arsenic/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-renderer-arsenic")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-resource-loader-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-resource-loader-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion station-templates-v0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
import babric.SubprojectHelpers.addModuleDependencies
import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
base.archivesName.set("station-templates-v0")
version = getSubprojectVersion(project, "1.0.0")

Expand Down
Loading