From 3c0b5637f77b9ee2127e40fc3a0b5608772fffb1 Mon Sep 17 00:00:00 2001 From: JFronny Date: Fri, 8 Mar 2024 18:33:27 +0100 Subject: [PATCH] feat: add fabric-api/libjf BOM if version is specified --- .../io/gitlab/jfronny/scripts/JfModExtension.kt | 2 ++ jfmod/src/main/kotlin/jfmod.module.gradle.kts | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt b/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt index 57e517d..a90e9df 100644 --- a/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt +++ b/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt @@ -9,6 +9,7 @@ import org.jetbrains.annotations.ApiStatus.Internal interface JfModExtension: LomExtension { val libJfVersion: Property + val fabricApiVersion: Property @get:Nested val curseforge: CurseForge @get:Nested val modrinth: Modrinth @@ -16,6 +17,7 @@ interface JfModExtension: LomExtension { override fun check(proj: Project) { super.check(proj) libJfVersion.finalizeValue() + fabricApiVersion.finalizeValue() modrinth.check(proj) curseforge.check(proj) } diff --git a/jfmod/src/main/kotlin/jfmod.module.gradle.kts b/jfmod/src/main/kotlin/jfmod.module.gradle.kts index dde0662..f3cb2fa 100644 --- a/jfmod/src/main/kotlin/jfmod.module.gradle.kts +++ b/jfmod/src/main/kotlin/jfmod.module.gradle.kts @@ -1,3 +1,4 @@ +import gradle.kotlin.dsl.accessors._2b47c59e4bff1a1e15af40cb0a9df00c.versionCatalogs import io.gitlab.jfronny.scripts.* import org.gradle.api.internal.project.ProjectStateInternal import org.gradle.api.tasks.compile.JavaCompile @@ -25,6 +26,9 @@ insertEarlyAfterEvaluate { 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()}")) + } clientAnnotationProcessor(annotationProcessor("io.gitlab.jfronny.libjf:libjf-config-compiler-plugin-v2:${rootArgs.libJfVersion.get()}")!!) } @@ -32,6 +36,15 @@ insertEarlyAfterEvaluate { options.compilerArgs.add("-AmodId=" + base.archivesName.get()) } } + if (rootArgs.fabricApiVersion.isPresent) { + dependencies { + modImplementation(platform("net.fabricmc.fabric-api:fabric-api-bom:${rootArgs.fabricApiVersion.get()}")) + } + } +} + +versionCatalogs { + } fun Project.pAfterEvaluate(action: (Project) -> Unit) =