From 804971bb7051c6c97ea093c3a9d177ffb47b4837 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 19 Feb 2018 14:12:08 +0000 Subject: [PATCH] Update gradle + Rewrite maven handling to fix #1442 --- Jenkinsfile | 2 +- build.gradle | 91 ++++++++--------------- gradle/wrapper/gradle-wrapper.jar | Bin 54711 -> 54706 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- 4 files changed, 34 insertions(+), 63 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9dec7959f..80b237e0a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ node { sh "rm -rf build/libs/" sh "rm -rf .gradle/asmInjector/" 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" diff --git a/build.gradle b/build.gradle index 989116525..4f228b2d1 100644 --- a/build.gradle +++ b/build.gradle @@ -193,76 +193,46 @@ task apiJar(type: Jar) { apiJar.mustRunAfter deobfJar -artifacts { - archives deobfJar - archives apiJar -} - build.dependsOn deobfJar, apiJar +publishing { + publications { + maven(MavenPublication) { + groupId 'TechReborn' + artifactId project.archivesBaseName + version project.version + from components.java -uploadArchives { - repositories { - mavenDeployer { - //This is used when the build is done on a slave node - if (project.hasProperty('mavenPass')) { - println 'Uploading to remote Maven Repo' - repository(url: "http://mavenupload.modmuss50.me/") { - 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/") + artifact apiJar { + classifier "api" } - 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'} - } - } - } + + 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 { + maven { + url "http://mavenupload.modmuss50.me/" + credentials { + username 'buildslave' + password project.getProperty('mavenPass') } } } } -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 task updateMappings(dependsOn: sourceJar) { @@ -357,6 +327,7 @@ task curseTools { import com.google.gson.GsonBuilder import com.google.gson.JsonObject import org.apache.commons.io.IOUtils + 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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 681b6bb50a54f25928e4af21371addd820c076b3..5874e218fbc5a55bc28f7eed7b33942a57a3b289 100644 GIT binary patch delta 64 zcmdnKnt9V|<_+%-v%Jd+_L=0 delta 76 zcmdnAntA(b<_+%-v-Ct>_L}_Zu%-9~U9W4VObh|u>>RfePw$doU|n6fWj041 W;S}Trsf5c+&cABQ=5z$8fB^uU_8UzA diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 82afe9ee7..bae316f8c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Feb 09 20:12:54 AEDT 2018 +#Mon Feb 19 13:23:28 GMT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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