From f3659b41c2bab29d3790640f2ff8d14ed48568a8 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Tue, 23 Apr 2024 21:40:11 +0200
Subject: [PATCH] fix(jfmod): fix and unify bom registration between libjf and
 fapi

---
 jfmod/src/main/kotlin/jfmod.module.gradle.kts | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/jfmod/src/main/kotlin/jfmod.module.gradle.kts b/jfmod/src/main/kotlin/jfmod.module.gradle.kts
index 88bda54..66dfa58 100644
--- a/jfmod/src/main/kotlin/jfmod.module.gradle.kts
+++ b/jfmod/src/main/kotlin/jfmod.module.gradle.kts
@@ -24,10 +24,21 @@ insertEarlyAfterEvaluate {
         copyFrom(rootArgs)
     }
 
+    fun DependencyHandlerScope.registerBom(notation: Any) {
+        listOf<(Any) -> Dependency?>(
+            this::modImplementation,
+            this::modLocalRuntime,
+            this::modApi,
+            this::include
+        ).forEach { function ->
+            function(platform(notation))
+        }
+    }
+
     if (rootArgs.libJfVersion.isPresent) {
         dependencies {
             if (SemanticVersion.parse(rootArgs.libJfVersion.get()) > SemanticVersion.parse("3.14.2")) {
-                modImplementation(platform("io.gitlab.jfronny.libjf:libjf-bom:${rootArgs.libJfVersion.get()}"))
+                registerBom("io.gitlab.jfronny.libjf:libjf-bom:${rootArgs.libJfVersion.get()}")
             }
             clientAnnotationProcessor(annotationProcessor("io.gitlab.jfronny.libjf:libjf-config-compiler-plugin-v2:${rootArgs.libJfVersion.get()}")!!)
         }
@@ -38,14 +49,7 @@ insertEarlyAfterEvaluate {
     }
     if (rootArgs.fabricApiVersion.isPresent) {
         dependencies {
-            listOf<(Any) -> Dependency?>(
-                this::modImplementation,
-                this::modLocalRuntime,
-                this::modApi,
-                this::include
-            ).forEach { function ->
-                function(platform("net.fabricmc.fabric-api:fabric-api-bom:${rootArgs.fabricApiVersion.get()}"))
-            }
+            registerBom("net.fabricmc.fabric-api:fabric-api-bom:${rootArgs.fabricApiVersion.get()}")
         }
     }
 }