From c7ec32cd1683ce3745b5086fc398b24fd2334239 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Sat, 27 Aug 2022 22:18:30 +0200 Subject: [PATCH] [ci skip] update buildscript --- build.gradle | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 3c3ad6f..8dd8229 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1656003793falsepattern33 +//version: 1656003793falsepattern36 /* DO NOT CHANGE THIS FILE! @@ -395,23 +395,19 @@ jar { } reobf { - if(usesMixins.toBoolean() && file(mixinSrg).exists()) { + if(usesMixins.toBoolean()) { addExtraSrgFile mixinSrg } } -afterEvaluate { - if(usesMixins.toBoolean()) { - tasks.compileJava { - options.compilerArgs += [ - "-AreobfSrgFile=${srgFile}", - "-AoutSrgFile=${mixinSrg}", - "-AoutRefMapFile=${mixinRefMap}", - // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code - "-XDenableSunApiLintControl", - "-XDignore.symbol.file" - ] - } +if(usesMixins.toBoolean()) { + tasks.compileJava { + options.compilerArgs += [ + '-Xlint:-processing', + "-AreobfSrgFile=${srgFile}", + "-AoutSrgFile=${mixinSrg}", + "-AoutRefMapFile=${mixinRefMap}" + ] } } @@ -657,13 +653,11 @@ def getCredentials = { } //Publishing +publish.dependsOn(build) publishing { publications { maven(MavenPublication) { - from components.java - if(usesShadowedDependencies.toBoolean()) { - artifact source: shadowJar, classifier: "" - } + artifact source: usesShadowedDependencies.toBoolean() ? shadowJar : jar, classifier: "" artifact source: sourcesJar, classifier: "sources" artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev" if (apiPackage) { @@ -672,7 +666,7 @@ publishing { groupId = mavenGroupId artifactId = mavenArtifactId + "-mc" + minecraftVersion - version = gitVersion() + version = modVersion // remove extra garbage from minecraft and minecraftDeps configuration pom.withXml {