From 2d82425b6d651558d1ff86c53bf4c0709cdcddd4 Mon Sep 17 00:00:00 2001 From: JFronny Date: Mon, 30 Sep 2024 19:57:52 +0200 Subject: [PATCH] fix(jfmod): support using separate version of libjf for config compiler --- .../src/main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt | 1 + jfmod/src/main/kotlin/jfmod.module.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 350850a..761b485 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 configCompilerPluginVersion: Property val fabricApiVersion: Property @get:Nested val curseforge: CurseForge @get:Nested val modrinth: Modrinth diff --git a/jfmod/src/main/kotlin/jfmod.module.gradle.kts b/jfmod/src/main/kotlin/jfmod.module.gradle.kts index c525d84..b5daa8e 100644 --- a/jfmod/src/main/kotlin/jfmod.module.gradle.kts +++ b/jfmod/src/main/kotlin/jfmod.module.gradle.kts @@ -48,7 +48,7 @@ insertEarlyAfterEvaluate { } } val dep = testAnnotationProcessor(annotationProcessor( - "io.gitlab.jfronny.libjf:libjf-config-compiler-plugin-v2:${rootArgs.libJfVersion.get()}" + "io.gitlab.jfronny.libjf:libjf-config-compiler-plugin-v2:${rootArgs.configCompilerPluginVersion.orElse(rootArgs.libJfVersion).get()}" )!!)!! if (lomArgs.isSplitSources) { clientAnnotationProcessor(dep)