Update gradle + Rewrite maven handling to fix #1442

This commit is contained in:
modmuss50 2018-02-19 14:12:08 +00:00
parent ec6fee9230
commit 804971bb70
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
4 changed files with 34 additions and 63 deletions

2
Jenkinsfile vendored
View file

@ -8,7 +8,7 @@ node {
sh "rm -rf build/libs/" sh "rm -rf build/libs/"
sh "rm -rf .gradle/asmInjector/" sh "rm -rf .gradle/asmInjector/"
sh "chmod +x gradlew" sh "chmod +x gradlew"
sh "./gradlew build mtDocGen uploadArchive curseTools --refresh-dependencies --stacktrace" sh "./gradlew build mtDocGen publish curseTools --refresh-dependencies --stacktrace"
stage "Archive artifacts" stage "Archive artifacts"

View file

@ -193,76 +193,46 @@ task apiJar(type: Jar) {
apiJar.mustRunAfter deobfJar apiJar.mustRunAfter deobfJar
artifacts {
archives deobfJar
archives apiJar
}
build.dependsOn deobfJar, apiJar build.dependsOn deobfJar, apiJar
publishing {
publications {
maven(MavenPublication) {
groupId 'TechReborn'
artifactId project.archivesBaseName
version project.version
from components.java
uploadArchives { artifact apiJar {
classifier "api"
}
artifact deobfJar {
classifier "dev"
}
artifact sourceJar {
classifier "sources"
}
//Removes all of the dependencies from the maven pom, fixes issues when other projects try to depend on tr
pom.withXml {
asNode().remove(asNode().get('dependencies'))
}
}
}
repositories { repositories {
mavenDeployer { maven {
//This is used when the build is done on a slave node url "http://mavenupload.modmuss50.me/"
if (project.hasProperty('mavenPass')) { credentials {
println 'Uploading to remote Maven Repo' username 'buildslave'
repository(url: "http://mavenupload.modmuss50.me/") { password project.getProperty('mavenPass')
authentication(userName: "buildslave", password: project.getProperty('mavenPass'))
}
} else {
//this is when the build is executed on the master node
println 'Uploading to local Maven Repo'
repository(url: "file:///var/www/maven/")
}
pom {
groupId = "TechReborn"
version = project.version
artifactId = project.archivesBaseName
project {
name project.archivesBaseName
packaging 'jar'
description 'TechReborn'
url 'https://github.com/TechReborn/TechReborn'
scm {
url 'https://github.com/TechReborn/TechReborn'
connection 'scm:git:git@github.com:TechReborn/TechReborn.git'
developerConnection 'scm:git:git@github.com:TechReborn/TechReborn.git'
}
issueManagement {
system 'github'
url 'https://github.com/TechReborn/TechReborn/issues'
}
licenses {
license {
name 'License'
url 'https://raw.githubusercontent.com/TechReborn/TechReborn/master/LICENSE.md'
distribution 'repo'
}
}
developers {
developer {
id 'modmuss50'
name 'modmuss50'
roles {role 'developer'}
}
developer {
id 'Gigabit101'
name 'Gigabit101'
roles {role 'developer'}
}
}
}
} }
} }
} }
} }
task wrapper(type: Wrapper) {
//To update the wrapper change the version bellow then run: gradle wrapper
gradleVersion = '2.13'
}
//Thanks Matthew from #ForgeGradle https://gist.github.com/matthewprenger/108265e3efc83181bd2cc2d2fc31a853 //Thanks Matthew from #ForgeGradle https://gist.github.com/matthewprenger/108265e3efc83181bd2cc2d2fc31a853
task updateMappings(dependsOn: sourceJar) { task updateMappings(dependsOn: sourceJar) {
@ -357,6 +327,7 @@ task curseTools {
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import com.google.gson.JsonObject import com.google.gson.JsonObject
import org.apache.commons.io.IOUtils import org.apache.commons.io.IOUtils
import java.util.zip.ZipFile import java.util.zip.ZipFile
//Reads the new fml_cache_annotation file built into the jar file, to find all crafttweaker methods, and saves the data to a file //Reads the new fml_cache_annotation file built into the jar file, to find all crafttweaker methods, and saves the data to a file

Binary file not shown.

View file

@ -1,6 +1,6 @@
#Fri Feb 09 20:12:54 AEDT 2018 #Mon Feb 19 13:23:28 GMT 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip