From 0a001b8a636b6217fffcf92392f266d6d02d379a Mon Sep 17 00:00:00 2001 From: stdpi Date: Sun, 22 Sep 2024 04:48:18 +0700 Subject: [PATCH 1/3] fix: javadoc tolerate bad html and match encoding, ugh --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 62e4c9025..043060ed9 100644 --- a/build.gradle +++ b/build.gradle @@ -158,6 +158,11 @@ allprojects { options.compilerArgs << '-parameters' options.encoding = "UTF-8" } + + javadoc { + options.encoding = "UTF-8" + options.addStringOption('Xdoclint:none', '-quiet') + } } if (JavaVersion.current().toString() != "17") { From 558b8e4eca29fc131e9f452dba3c1fef4ac6e391 Mon Sep 17 00:00:00 2001 From: stdpi Date: Sun, 22 Sep 2024 15:51:50 +0700 Subject: [PATCH 2/3] add more jar package (javadocJar sourcesJar) --- build.gradle | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build.gradle b/build.gradle index 043060ed9..b8e679489 100644 --- a/build.gradle +++ b/build.gradle @@ -190,6 +190,19 @@ task iris(type: Copy) { dependsOn(build) } +task sourcesJar(type: Jar, dependsOn: classes) { + dependsOn(iris) + archiveClassifier.set('sources') + from sourceSets.main.allSource +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + dependsOn(iris) + archiveClassifier.set('javadoc') + from javadoc.destinationDir +} + + def registerCustomOutputTask(name, path) { if (!System.properties['os.name'].toLowerCase().contains('windows')) { return; From a5ef89a1280e8438e2efc70b7cf0198a2d7d8a0b Mon Sep 17 00:00:00 2001 From: stdpi Date: Sun, 22 Sep 2024 17:22:37 +0700 Subject: [PATCH 3/3] add irisDev task to copy javadocs and sources jar --- build.gradle | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index b8e679489..42fbe6d58 100644 --- a/build.gradle +++ b/build.gradle @@ -109,10 +109,10 @@ allprojects { repositories { mavenCentral() - maven { url "https://repo.papermc.io/repository/maven-public/"} + maven { url "https://repo.papermc.io/repository/maven-public/" } maven { url "https://repo.codemc.org/repository/maven-public" } maven { url "https://mvn.lumine.io/repository/maven-public/" } - maven { url "https://jitpack.io"} + maven { url "https://jitpack.io" } maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots" } maven { url "https://mvn.lumine.io/repository/maven/" } @@ -163,6 +163,16 @@ allprojects { options.encoding = "UTF-8" options.addStringOption('Xdoclint:none', '-quiet') } + + task sourcesJar(type: Jar, dependsOn: classes) { + archiveClassifier.set('sources') + from sourceSets.main.allSource + } + + task javadocJar(type: Jar, dependsOn: javadoc) { + archiveClassifier.set('javadoc') + from javadoc.destinationDir + } } if (JavaVersion.current().toString() != "17") { @@ -190,16 +200,17 @@ task iris(type: Copy) { dependsOn(build) } -task sourcesJar(type: Jar, dependsOn: classes) { - dependsOn(iris) - archiveClassifier.set('sources') - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { +// with classifier: 'javadoc' and 'sources' +task irisDev(type: Copy) { + group "iris" + from("core/build/libs/core-javadoc.jar", "core/build/libs/core-sources.jar") + rename { String fileName -> + fileName.replace("core", "Iris-${version}") + } + into layout.buildDirectory.asFile.get() dependsOn(iris) - archiveClassifier.set('javadoc') - from javadoc.destinationDir + dependsOn("core:sourcesJar") + dependsOn("core:javadocJar") }