From: Matt Corallo <git@bluematt.me>
Date: Sat, 28 Oct 2023 16:29:11 +0000 (+0000)
Subject: [Java] Give up on javadoc entirely as we just cannot require HTML
X-Git-Tag: v0.0.118.0^2~1
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c46116b158e06be77e77ec5e947e5375afeb17f4;p=ldk-java

[Java] Give up on javadoc entirely as we just cannot require HTML
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32895fcd..33ee7373 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -265,13 +265,11 @@ jobs:
           cp ldk-java.jar ldk-java-bins/new/
           cp ldk-java-leaktracking.jar ldk-java-bins/new/
           cp ldk-java-classes.jar ldk-java-bins/new/
-          cp ldk-java-javadoc.jar ldk-java-bins/new/
           cd ldk-java-bins
           rm "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/liblightningjs.wasm" # TODO: Test this
           if ! diff -r "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" new/; then
             apt-get -y install diffoscope
             diffoscope new/ldk-java-sources.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-sources.jar" || echo
-            diffoscope new/ldk-java-javadoc.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-javadoc.jar" || echo
             diffoscope new/ldk-java-classes.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-classes.jar" || echo
             diffoscope new/ldk-java.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java.jar" || echo
             diffoscope new/ldk-java-leaktracking.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-leaktracking.jar" || echo
diff --git a/build-release-jar.sh b/build-release-jar.sh
index ef1c3ee2..7798c77d 100755
--- a/build-release-jar.sh
+++ b/build-release-jar.sh
@@ -12,9 +12,9 @@ ls src/main/resources/liblightningjni_MacOSX-aarch64.nativelib
 export LC_ALL=C
 
 # We need to fetch dependencies first as faketime will break PKI cert checks!
-mvn -DskipTests=true -Dorg.lightningdevkit.skipdocs=false package
+mvn -DskipTests=true package
 mvn clean
-faketime 2021-01-01 mvn -DskipTests=true -Dorg.lightningdevkit.skipdocs=false package
+faketime 2021-01-01 mvn -DskipTests=true package
 
 mkdir ziptmp
 cd ziptmp
@@ -26,26 +26,6 @@ rm ../target/ldk-java-*-sources.jar
 cd ..
 rm -r ziptmp
 
-mkdir ziptmp
-cd ziptmp
-unzip ../target/ldk-java-*-javadoc.jar | grep inflating | awk '{ print $2 }' | sort > ../javadoc-zip-files.txt
-find . | grep '.html$' | xargs -L1 sed -i 's/Generated by javadoc \(.*\) on Fri Jan 01 .* UTC 2021/Generated by javadoc \1 on Fri Jan 01 00:00:00 UTC 2021/g'
-for ZIP in *.zip; do
-	mkdir ziptmptmp
-	cd ziptmptmp
-	unzip ../$ZIP | grep inflating | awk '{ print $2 }' | sort > ../../javadoc-zip-zip-files.txt
-	rm ../$ZIP
-	touch -d "2021-01-01 00:00 UTC" $(cat ../../javadoc-zip-zip-files.txt)
-	cat ../../javadoc-zip-zip-files.txt | zip -X@ ../$ZIP
-	cd ..
-	rm -r ziptmptmp
-done
-touch -d "2021-01-01 00:00 UTC" $(cat ../javadoc-zip-files.txt)
-cat ../javadoc-zip-files.txt | grep -v nativelib | zip -X@ ../ldk-java-javadoc.jar
-rm ../target/ldk-java-*-javadoc.jar
-cd ..
-rm -r ziptmp
-
 mkdir ziptmp
 cd ziptmp
 unzip ../target/ldk-java-*.jar | grep inflating | awk '{ print $2 }' | sort > ../classes-zip-files.txt