From 4f0f8d7821bf995d0bd11c55d0ce44e48d84475e Mon Sep 17 00:00:00 2001
From: Arnaud Roques <plantuml@gmail.com>
Date: Tue, 14 Nov 2023 21:31:05 +0100
Subject: [PATCH] chore: remove windows test and generate javadoc with frames

---
 .github/workflows/ci.yml | 41 ++--------------------------------------
 build.gradle.kts         |  1 +
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c6e17e6f..c46cf60d5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -116,43 +116,6 @@ jobs:
           name: ${{ github.run_number }}-${{ matrix.os }}-java-${{ matrix.java_version }}-test-reports
           path: build/reports/tests/
 
-  test_windows:
-    needs: workflow_config
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [ 8 ]
-        os: [ windows-latest ]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout the repository
-        if: needs.workflow_config.outputs.do_test_windows == 'true'
-        uses: actions/checkout@v4
-
-      - name: Set up java
-        if: needs.workflow_config.outputs.do_test_windows == 'true'
-        uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.java_version }}
-          distribution: temurin
-          cache: gradle
-
-      # Compile / Test / Package are separate steps so the reason for any failure is more obvious in GitHub UI
-      - name: Compile
-        if: needs.workflow_config.outputs.do_test_windows == 'true'
-        run: gradle -q compileJava --no-daemon
-
-      - name: Test
-        if: needs.workflow_config.outputs.do_test_windows == 'true'
-        run: gradle test --no-daemon -i
-
-      - name: Upload test reports
-        uses: actions/upload-artifact@v3
-        if: needs.workflow_config.outputs.do_test_windows == 'true'
-        with:
-          # Using github.run_number here to reduce confusion when downloading & comparing from several builds
-          name: ${{ github.run_number }}-${{ matrix.os }}-java-${{ matrix.java_version }}-test-reports
-          path: build/reports/tests/
 
   build_artifacts:
     needs: [ workflow_config ]
@@ -218,7 +181,7 @@ jobs:
           enableCrossOsArchive: true
 
   deploy_javadoc:
-    needs: [ build_artifacts ]
+    needs: [ build_artifacts, test_linux ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
@@ -323,7 +286,7 @@ jobs:
           gradle --debug publish
 
   push_to_docker_registry:
-    needs: [ workflow_config, upload, test_linux, test_windows ]
+    needs: [ workflow_config, upload, test_linux ]
     if: needs.workflow_config.outputs.do_release == 'true'
     runs-on: ubuntu-latest
     steps:
diff --git a/build.gradle.kts b/build.gradle.kts
index 72fb2d760..ab022ce26 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,6 +150,7 @@ tasks.withType<JavaCompile>().configureEach {
 tasks.withType<Javadoc>().configureEach {
 	options {
 		this as StandardJavadocDocletOptions
+		addBooleanOption("frames", true)
 		addBooleanOption("Xdoclint:none", true)
 		addStringOption("Xmaxwarns", "1")
 		encoding = "UTF-8"