From 12310858defa3b22218aa697d24d76c532633fbb Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Mon, 22 Apr 2019 17:12:05 +0200 Subject: [PATCH] update buildsystem to use maven-publish, hopefully --- Jenkinsfile | 5 ++-- build.gradle | 36 ++++++++++++++++++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9f17d8928..6272f30be 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,10 +9,11 @@ pipeline { steps { sh "rm -rf build/libs/" sh "chmod +x gradlew" - sh "./gradlew build uploadArchives curseforge --refresh-dependencies --stacktrace" + sh "./gradlew clean --stacktrace" + sh "./gradlew build publish curseforge --refresh-dependencies --stacktrace" archiveArtifacts artifacts: '**/build/libs/*.jar', fingerprint: true } } } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index 17bcaf7e9..2f94e84c2 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } } dependencies { - classpath "net.fabricmc:fabric-loom:0.2.1-SNAPSHOT" + classpath "net.fabricmc:fabric-loom:0.2.2-SNAPSHOT" } } @@ -16,6 +16,7 @@ plugins { id 'java' id 'eclipse' id 'idea' + id 'maven-publish' id 'com.matthewprenger.cursegradle' version "1.1.2" } @@ -27,7 +28,7 @@ targetCompatibility = 1.8 archivesBaseName = "fabric" def baseVersion = "0.2.7" -def mcVersion = "1.14 Pre-Release 3" +def mcVersion = "1.14 Pre-Release 5" def ENV = System.getenv() version = baseVersion + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local") @@ -38,8 +39,8 @@ minecraft { dependencies { minecraft "com.mojang:minecraft:$mcVersion" - mappings "net.fabricmc:yarn:$mcVersion+build.1" - modCompile "net.fabricmc:fabric-loader:0.4.1+build.125" + mappings "net.fabricmc:yarn:$mcVersion+build.2" + modCompile "net.fabricmc:fabric-loader:0.4.2+build.131" } processResources { @@ -78,6 +79,31 @@ curseforge { } } -apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/maven.gradle' +publishing { + publications { + maven(MavenPublication) { + groupId "net.fabricmc" + artifactId "fabric" + artifact (jar) { + builtBy remapJar + } + artifact (sourcesJar) { + builtBy remapSourcesJar + } + } + } + repositories { + maven { + url "http://mavenupload.modmuss50.me/" + if (project.hasProperty('mavenPass')) { + credentials { + username 'buildslave' + password project.getProperty('mavenPass') + } + } + } + } +} + apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/license.gradle' apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b9e1d2cf2..6825a5bfc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip