Revert "Integrade shadow"

This reverts commit 3c347b4b6a
This commit is contained in:
Johannes Frohnmeyer 2022-03-30 21:01:44 +00:00
parent 3c347b4b6a
commit 39d8795c35
1 changed files with 8 additions and 22 deletions

View File

@ -17,7 +17,6 @@ buildscript {
classpath "org.ajoberstar.grgit:grgit-gradle:5.0.0"
classpath "com.modrinth.minotaur:Minotaur:2.1.0"
classpath "io.gitlab.jfronny:CurseGradle:1.4.0-1642087331626"
classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
}
}
@ -147,7 +146,6 @@ allprojects {
apply plugin: "java-library"
apply plugin: "maven-publish"
apply plugin: net.fabricmc.loom.bootstrap.LoomGradlePluginBootstrap
apply plugin: com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
@ -190,14 +188,9 @@ allprojects {
archiveClassifier = "dev"
}
shadowJar {
configurations = [ project.configurations.shadow ]
}
afterEvaluate {
remapJar {
dependsOn shadowJar
input = shadowJar.archiveFile
input = file("${project.buildDir}/devlibs/$archivesBaseName-${project.version}-dev.jar")
archiveFileName = "${archivesBaseName}-${project.version}.jar"
}
@ -214,14 +207,6 @@ allprojects {
}
}
task remapMavenJar(type: net.fabricmc.loom.task.RemapJarTask, dependsOn: jar) {
dependsOn shadowJar
input = shadowJar.archiveFile
archiveFileName = "${archivesBaseName}-${project.version}-maven.jar"
addNestedDependencies = false
}
build.dependsOn remapMavenJar
java {
withSourcesJar()
}
@ -231,6 +216,13 @@ allprojects {
reproducibleFileOrder = true
}
task remapMavenJar(type: net.fabricmc.loom.task.RemapJarTask, dependsOn: jar) {
input = jar.archiveFile
archiveFileName = "${archivesBaseName}-${project.version}-maven.jar"
addNestedDependencies = false
}
build.dependsOn remapMavenJar
publishing {
publications {
mavenJava(MavenPublication) {
@ -273,12 +265,6 @@ subprojects {
}
}
dependencies {
subprojects.each {
api it
}
}
void setupRepositories(RepositoryHandler repositories) {
def ENV = System.getenv()
if (project.hasProperty("maven")) {