Fix jar builds.

This commit is contained in:
LambdAurora
2020-07-18 18:55:44 +02:00
parent 257f01ec19
commit 2785d634dc
3 changed files with 13 additions and 13 deletions

View File

@@ -42,4 +42,4 @@ This mod also adds controller support.
## Build ## Build
Just do `./gradlew :fabric:build` and everything should build just fine! Just do `./gradlew :fabric:shadowRemapJar` and everything should build just fine!

View File

@@ -8,8 +8,6 @@ archivesBaseName = project.archives_base_name + "-core"
dependencies { dependencies {
api "org.jetbrains:annotations:17.0.0" api "org.jetbrains:annotations:17.0.0"
api "org.aperlambda:lambdajcommon:1.8.0" api "org.aperlambda:lambdajcommon:1.8.0"
api "com.electronwill.night-config:core:3.5.3"
api "com.electronwill.night-config:toml:3.5.3"
} }
java { java {

View File

@@ -33,7 +33,9 @@ repositories {
} }
configurations { configurations {
shadowInternal
shadow shadow
api.extendsFrom shadow
} }
dependencies { dependencies {
@@ -54,8 +56,9 @@ dependencies {
modImplementation "me.shedaniel:RoughlyEnoughItems:4.5.5" modImplementation "me.shedaniel:RoughlyEnoughItems:4.5.5"
api project(":core") api project(":core")
shadow project(":core") shadowInternal project(":core")
shadow("org.aperlambda:lambdajcommon:1.8.0") { shadow("org.aperlambda:lambdajcommon:1.8.0") {
// Minecraft already has all that google crap.
exclude group: 'com.google.code.gson' exclude group: 'com.google.code.gson'
exclude group: 'com.google.guava' exclude group: 'com.google.guava'
} }
@@ -85,14 +88,6 @@ java {
jar { jar {
from "../LICENSE" from "../LICENSE"
from {
configurations.shadow.filter {
it.getName().contains("lambdacontrols")
}.collect {
it.isDirectory() ? it : zipTree(it)
}
}
} }
task shadowJar(type: Jar) { task shadowJar(type: Jar) {
@@ -100,6 +95,13 @@ task shadowJar(type: Jar) {
from sourceSets.main.output from sourceSets.main.output
from {
configurations.shadowInternal.filter {
it.getName().contains("lambdacontrols")
}.collect {
it.isDirectory() ? it : zipTree(it)
}
}
from { from {
configurations.shadow.collect { configurations.shadow.collect {
it.isDirectory() ? it : zipTree(it) it.isDirectory() ? it : zipTree(it)