Skip to content

Commit c7ec32c

Browse files
committed
[ci skip] update buildscript
1 parent 7c8c2cc commit c7ec32c

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

build.gradle

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//version: 1656003793falsepattern33
1+
//version: 1656003793falsepattern36
22
/*
33
DO NOT CHANGE THIS FILE!
44
@@ -395,23 +395,19 @@ jar {
395395
}
396396

397397
reobf {
398-
if(usesMixins.toBoolean() && file(mixinSrg).exists()) {
398+
if(usesMixins.toBoolean()) {
399399
addExtraSrgFile mixinSrg
400400
}
401401
}
402402

403-
afterEvaluate {
404-
if(usesMixins.toBoolean()) {
405-
tasks.compileJava {
406-
options.compilerArgs += [
407-
"-AreobfSrgFile=${srgFile}",
408-
"-AoutSrgFile=${mixinSrg}",
409-
"-AoutRefMapFile=${mixinRefMap}",
410-
// Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
411-
"-XDenableSunApiLintControl",
412-
"-XDignore.symbol.file"
413-
]
414-
}
403+
if(usesMixins.toBoolean()) {
404+
tasks.compileJava {
405+
options.compilerArgs += [
406+
'-Xlint:-processing',
407+
"-AreobfSrgFile=${srgFile}",
408+
"-AoutSrgFile=${mixinSrg}",
409+
"-AoutRefMapFile=${mixinRefMap}"
410+
]
415411
}
416412
}
417413

@@ -657,13 +653,11 @@ def getCredentials = {
657653
}
658654

659655
//Publishing
656+
publish.dependsOn(build)
660657
publishing {
661658
publications {
662659
maven(MavenPublication) {
663-
from components.java
664-
if(usesShadowedDependencies.toBoolean()) {
665-
artifact source: shadowJar, classifier: ""
666-
}
660+
artifact source: usesShadowedDependencies.toBoolean() ? shadowJar : jar, classifier: ""
667661
artifact source: sourcesJar, classifier: "sources"
668662
artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
669663
if (apiPackage) {
@@ -672,7 +666,7 @@ publishing {
672666

673667
groupId = mavenGroupId
674668
artifactId = mavenArtifactId + "-mc" + minecraftVersion
675-
version = gitVersion()
669+
version = modVersion
676670

677671
// remove extra garbage from minecraft and minecraftDeps configuration
678672
pom.withXml {

0 commit comments

Comments
 (0)