From 34abe7aac0d55cfb41d31ddbd1341abdb3a2c352 Mon Sep 17 00:00:00 2001 From: TropheusJ Date: Tue, 20 Feb 2024 17:08:48 -0500 Subject: [PATCH] use a provider for git branch --- build.gradle | 15 +++++++-------- .../porting_lib_build/PortingLibExtension.java | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index a0cb6d2f8..ea57071f7 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ import io.github.fabricators_of_create.porting_lib_build.PortingLibBuildPlugin //file:noinspection GroovyAccessibility plugins { id "fabric-loom" - id "org.ajoberstar.grgit" version "4.1.1" id "maven-publish" } @@ -14,6 +13,12 @@ targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = "porting_lib" +String branch = providers.exec { + it.setCommandLine("git", "branch", "--show-current") +}.standardOutput.asText.map { + it.contains("not a git repository") ? "unknown" : it +}.get().trim() + dependencies { subprojects.forEach { api(include(project(path: ":$it.name", configuration: "namedElements"))) @@ -33,13 +38,7 @@ allprojects { group = "io.github.fabricators_of_create.Porting-Lib" - version = project.mod_version - - if (grgit != null) { - version += "+${grgit.getBranch().current().name}" - } else { - version += "+custom_unknown" - } + version = mod_version + "+" + branch repositories { mavenCentral() diff --git a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibExtension.java b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibExtension.java index fd2320e6c..b4f2ee59a 100644 --- a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibExtension.java +++ b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibExtension.java @@ -37,7 +37,7 @@ public void addModuleDependency(String name) { loom.mods(mods -> mods.register("porting_lib_" + name, settings -> { Project depProject = project.project(":" + name); SourceSetContainer sourceSets = depProject.getExtensions().getByType(SourceSetContainer.class); - settings.sourceSet(sourceSets.getByName("main")); + settings.sourceSet(sourceSets.getByName("main"), depProject); })); }