Fix server startup, jar building and after-merge fixes.

This commit is contained in:
Sebastian Hartte
2020-07-28 22:45:09 +02:00
parent 75dd1d4bb6
commit 33d247fec8
10 changed files with 28 additions and 160 deletions
+10 -22
View File
@@ -75,13 +75,6 @@ sourceSets {
compileClasspath += sourceSets.main.output
runtimeClasspath += sourceSets.main.output
}
unported {
compileClasspath += sourceSets.api.output
runtimeClasspath += sourceSets.api.output
compileClasspath += sourceSets.main.output
runtimeClasspath += sourceSets.main.output
}
test {
compileClasspath += sourceSets.api.output
runtimeClasspath += sourceSets.api.output
@@ -91,7 +84,6 @@ sourceSets {
configurations {
apiCompile.extendsFrom(compileClasspath)
datagenCompile.extendsFrom(compileClasspath)
unportedCompile.extendsFrom(compileClasspath)
}
apply from: 'gradle/scripts/spotless.gradle'
@@ -110,7 +102,13 @@ dependencies {
modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
modImplementation "alexiil.mc.lib:libblockattributes-all:0.7.1-pre.4"
modImplementation "alexiil.mc.lib:libblockattributes-core:${libblockattributes_version}"
modImplementation "alexiil.mc.lib:libblockattributes-items:${libblockattributes_version}"
modImplementation "alexiil.mc.lib:libblockattributes-fluids:${libblockattributes_version}"
include "alexiil.mc.lib:libblockattributes-core:${libblockattributes_version}"
include "alexiil.mc.lib:libblockattributes-items:${libblockattributes_version}"
include "alexiil.mc.lib:libblockattributes-fluids:${libblockattributes_version}"
modImplementation "me.shedaniel:RoughlyEnoughItems:4.6.6"
modImplementation "mcp.mobius.waila:Hwyla:1.16.1-1.9.22-75"
@@ -136,24 +134,14 @@ processResources {
}
}
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this task, sources will not be generated.
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = "sources"
from sourceSets.main.allSource
}
jar {
from "LICENSE"
}
apply from: 'gradle/scripts/artifacts.gradle'
apply from: 'gradle/scripts/curseforge.gradle'
publishing {
publications {
mavenJava(MavenPublication) {
artifactId = 'appliedenergistics2-fabric'
// add all the jars that should be included when publishing to maven
artifact(remapJar) {
builtBy remapJar