use a provider for git branch

Fabricators-of-Create · Feb 20, 2024 · 34abe7a · 34abe7a
1 parent e13bd40
commit 34abe7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git 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/.../src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibExtension.java b/.../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);
 		}));
 	}