Revert moving to jar task as Annotation Processors do not process Common

This commit is contained in:
Jared 2022-06-16 22:14:21 +02:00
parent 4872239044
commit 19177326f1
No known key found for this signature in database
GPG Key ID: DB3BA3B9088A1BDF
2 changed files with 8 additions and 23 deletions

View File

@ -16,12 +16,6 @@ dependencies {
} }
loom { loom {
mods {
register(mod_id) {
sourceSet sourceSets.main
sourceSet project(":Common").sourceSets.main
}
}
runs { runs {
client { client {
client() client()
@ -38,7 +32,9 @@ loom {
} }
} }
processResources { processResources {
from project(":Common").sourceSets.main.resources
inputs.property "version", project.version inputs.property "version", project.version
filesMatching("fabric.mod.json") { filesMatching("fabric.mod.json") {
@ -46,16 +42,8 @@ processResources {
} }
} }
jar { tasks.withType(JavaCompile) {
from project(":Common").sourceSets.main.output source(project(":Common").sourceSets.main.allSource)
}
javadoc {
source project(":Common").sourceSets.main.allJava
}
sourcesJar {
from project(":Common").sourceSets.main.allSource
} }
publishing { publishing {

View File

@ -77,17 +77,14 @@ dependencies {
compileOnly project(":Common") compileOnly project(":Common")
} }
jar { tasks.withType(JavaCompile) {
from project(":Common").sourceSets.main.output source(project(":Common").sourceSets.main.allSource)
} }
javadoc { processResources {
source project(":Common").sourceSets.main.allJava from project(":Common").sourceSets.main.resources
} }
sourcesJar {
from project(":Common").sourceSets.main.allSource
}
jar.finalizedBy('reobfJar') jar.finalizedBy('reobfJar')