fix(jfmod): fix and unify bom registration between libjf and fapi
This commit is contained in:
parent
1d8c9eac97
commit
f3659b41c2
|
@ -24,10 +24,21 @@ insertEarlyAfterEvaluate {
|
||||||
copyFrom(rootArgs)
|
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) {
|
if (rootArgs.libJfVersion.isPresent) {
|
||||||
dependencies {
|
dependencies {
|
||||||
if (SemanticVersion.parse(rootArgs.libJfVersion.get()) > SemanticVersion.parse("3.14.2")) {
|
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()}")!!)
|
clientAnnotationProcessor(annotationProcessor("io.gitlab.jfronny.libjf:libjf-config-compiler-plugin-v2:${rootArgs.libJfVersion.get()}")!!)
|
||||||
}
|
}
|
||||||
|
@ -38,14 +49,7 @@ insertEarlyAfterEvaluate {
|
||||||
}
|
}
|
||||||
if (rootArgs.fabricApiVersion.isPresent) {
|
if (rootArgs.fabricApiVersion.isPresent) {
|
||||||
dependencies {
|
dependencies {
|
||||||
listOf<(Any) -> Dependency?>(
|
registerBom("net.fabricmc.fabric-api:fabric-api-bom:${rootArgs.fabricApiVersion.get()}")
|
||||||
this::modImplementation,
|
|
||||||
this::modLocalRuntime,
|
|
||||||
this::modApi,
|
|
||||||
this::include
|
|
||||||
).forEach { function ->
|
|
||||||
function(platform("net.fabricmc.fabric-api:fabric-api-bom:${rootArgs.fabricApiVersion.get()}"))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue