mirror of https://github.com/YatopiaMC/Yatopia.git
Publish jar in jenkins and fix javadoc generation
This commit is contained in:
parent
d1406b2d89
commit
63dcfea8c8
|
@ -47,13 +47,22 @@ pipeline {
|
|||
publisherStrategy: 'EXPLICIT'
|
||||
) {
|
||||
withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) {
|
||||
sh './gradlew generatePaperclipPatch publish' // when paper fixes paperclip for forks then use - ./gradlew paperclipJar publish
|
||||
// cp -v "$paperworkdir/Paperclip/assembly/target/paperclip-$mcver.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar" - this code needs to be reworked
|
||||
sh './gradlew build publish'
|
||||
sh 'mkdir -p "./target"'
|
||||
sh 'paperworkdir="$basedir/.gradle/caches/paperweight/upstreams/paper/work"'
|
||||
sh 'mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)'
|
||||
sh 'cp -v "build/libs/Yatopia-$mcver-R0.1-SNAPSHOT.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Archive Jars') {
|
||||
steps {
|
||||
archiveArtifacts(artifacts: 'target/*.jar', fingerprint: true)
|
||||
}
|
||||
}
|
||||
|
||||
stage('Discord Webhook') {
|
||||
steps {
|
||||
script {
|
||||
|
|
|
@ -35,7 +35,7 @@ Run the following commands in the root directory:
|
|||
|
||||
```shell
|
||||
./gradlew applyPatches
|
||||
./gradlew paperclipJar
|
||||
./gradlew build
|
||||
```
|
||||
If You are using windows cmd , then remove the `./` before `gradlew` , if You are using powershell , You don't need to change anything.
|
||||
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Toffikk <slodkitofik@gmail.com>
|
||||
Date: Thu, 17 Jun 2021 14:44:11 +0200
|
||||
Subject: [PATCH] Fix Javadoc generation
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 6d04816e22f44a33c001d2b7e080402fba6af86c..24820ac11fd70d4f0db3fd7d51a4e48fbd6ee184 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -68,6 +68,8 @@ tasks.jar {
|
||||
}
|
||||
|
||||
tasks.withType<Javadoc>().configureEach {
|
||||
+ (options as StandardJavadocDocletOptions).encoding = "UTF-8"
|
||||
+ (options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
|
||||
(options as StandardJavadocDocletOptions).links(
|
||||
"https://guava.dev/releases/21.0/api/docs/",
|
||||
"https://javadoc.io/doc/org.yaml/snakeyaml/1.27/",
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Add NBT API as a first-class lib
|
|||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index dffd42fa0862a04fbb63dbc2c378d41eac2aafb5..ffae74d0cb80624cae6ec2b42d1cdec66768b5dd 100644
|
||||
index 24820ac11fd70d4f0db3fd7d51a4e48fbd6ee184..ffae74d0cb80624cae6ec2b42d1cdec66768b5dd 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -3,6 +3,7 @@ import java.util.Locale
|
||||
|
@ -24,7 +24,7 @@ index dffd42fa0862a04fbb63dbc2c378d41eac2aafb5..ffae74d0cb80624cae6ec2b42d1cdec6
|
|||
|
||||
compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
|
||||
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
|
||||
@@ -68,6 +70,9 @@ tasks.jar {
|
||||
@@ -74,6 +76,9 @@ tasks.jar {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -32,8 +32,8 @@ index dffd42fa0862a04fbb63dbc2c378d41eac2aafb5..ffae74d0cb80624cae6ec2b42d1cdec6
|
|||
+ relocate("de.tr7zw.changeme.nbtapi", "de.tr7zw.nbtapi")
|
||||
+}
|
||||
tasks.withType<Javadoc>().configureEach {
|
||||
(options as StandardJavadocDocletOptions).links(
|
||||
"https://guava.dev/releases/21.0/api/docs/",
|
||||
(options as StandardJavadocDocletOptions).encoding = "UTF-8"
|
||||
(options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
|
||||
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
|
||||
index 98263d896f316983609432c45b85401a2692432d..44a649d8dc97c7b271b1000bff893edd7be46360 100644
|
||||
--- a/src/main/java/org/bukkit/Chunk.java
|
Loading…
Reference in New Issue