Johannes/Scripts
1
0
Fork 0
Code Issues Packages Projects Releases Activity

fix: maybe add testmod dependency properly
All checks were successful
ci/woodpecker/push/gradle Pipeline was successful
Details
ci/woodpecker/push/pages Pipeline was successful
Details

Browse Source
This commit is contained in:
Johannes Frohnmeyer 2024-07-21 17:34:43 +02:00
parent 26f31906bb
commit 05af344da2
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jfmod/src/main/kotlin/jfmod.module.gradle.kts
View File

@ -65,22 +65,19 @@ afterEvaluate {
rootProject.allprojects.forEach { rootProject.allprojects.forEach {
it.pAfterEvaluate { sub -> it.pAfterEvaluate { sub ->
if (sub != this && rootArgs.isMod(sub)) { if (sub != this && rootArgs.isMod(sub)) {
if (rootArgs.isFabric(sub) && lomArgs.isFabric) { loom {
loom { mods {
mods { register(sub.name) {
register(sub.name) { sourceSet(sub.sourceSets.main.get())
sourceSet(sub.sourceSets.main.get()) if (rootArgs.isSplitSources(sub)) sourceSet(sub.sourceSets.client.get())
if (rootArgs.isSplitSources(sub)) sourceSet(sub.sourceSets.client.get()) }
} if (!sourceSets.testmod.get().resources.isEmpty) {
if (!sourceSets.testmod.get().resources.isEmpty) { register("${sub.name}-testmod") {
register("${sub.name}-testmod") { sourceSet(sub.sourceSets.testmod.get())
sourceSet(sub.sourceSets.testmod.get())
}
} }
} }
} }
} }
//TODO handle forge
} }
} }
} }
@ -103,7 +100,7 @@ afterEvaluate {
if (!isRoot) rootProject.dependencies { if (!isRoot) rootProject.dependencies {
api(project(path = project.path, configuration = "shadow")) api(project(path = project.path, configuration = "shadow"))
if (lomArgs.isSplitSources) clientImplementation(sourceSets.client.get().output) if (lomArgs.isSplitSources) clientImplementation(sourceSets.client.get().output)
testmodImplementation(sourceSets.testmod.get().output) testmodImplementation(project(mapOf("path" to project.path, "configuration" to "testmod")))
if (!devOnly) include(project) if (!devOnly) include(project)
} }

11
lom/src/main/kotlin/lom.gradle.kts
View File

@ -205,7 +205,11 @@ tasks.publish { dependsOn(tasks.build) }
tasks.deployDebug.dependsOn(tasks.publish) tasks.deployDebug.dependsOn(tasks.publish)
// create testmodInclude configuration // create testmodInclude configuration
val testmodIncludeConfiguration = configurations.create("testmodInclude") val testmodInclude by configurations.creating
val testmod by configurations.creating {
isCanBeConsumed = true
isCanBeResolved = false
}
if (hasTestmod) { if (hasTestmod) {
// generate jar from testmod source set // generate jar from testmod source set
@ -214,6 +218,9 @@ if (hasTestmod) {
destinationDirectory.set(devlibs) destinationDirectory.set(devlibs)
archiveClassifier.set("testmod") archiveClassifier.set("testmod")
} }
artifacts {
add(testmod.name, testmodJar)
}
afterEvaluate { afterEvaluate {
// remap configuration for outputting usable testmod jar // remap configuration for outputting usable testmod jar
@ -223,7 +230,7 @@ if (hasTestmod) {
archiveClassifier.set("testmod") archiveClassifier.set("testmod")
// add nested jars from testmodInclude // add nested jars from testmodInclude
addNestedDependencies.set(true) addNestedDependencies.set(true)
nestedJars.setFrom(*testmodIncludeConfiguration.files.toTypedArray()) nestedJars.setFrom(*testmodInclude.files.toTypedArray())
} }
tasks.assemble { dependsOn(remapTestmodJar) } tasks.assemble { dependsOn(remapTestmodJar) }
} }