Merge branch 'develop'

beatngu13 · Oct 25, 2023 · 026c9cf · 026c9cf
2 parents d113b11 + 3c33090
commit 026c9cf
Show file tree

Hide file tree

Showing 26 changed files with 978 additions and 178 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -2,4 +2,3 @@ changelog:
   exclude:
     labels:
       - exclude release notes
-      - dependencies
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,8 +3,8 @@ name: Build
 on: push
 
 env:
-  GRAALVM_VERSION: 22.0.0.2
-  JAVA_VERSION: 17
+  GRAALVM_VERSION: 22.1.0.1-Final
+  JAVA_VERSION: java17
 
 jobs:
   build:
@@ -14,37 +14,38 @@ jobs:
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # fetch unshallow to enable blame for Sonar
           fetch-depth: 0
 
       - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@v1
+        uses: gluonhq/setup-graalvm@6eecc74f9ad1f028b863d7a494e351668a1b0370
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          version: ${{ env.GRAALVM_VERSION }}
-          java-version: ${{ env.JAVA_VERSION }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          graalvm: ${{ env.GRAALVM_VERSION }}
+          jdk: ${{ env.JAVA_VERSION }}
 
       - name: Cache Maven
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository/
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ secrets.CACHE_VERSION }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
 
       - name: Cache Sonar
         uses: actions/cache@v3
         with:
           path: ~/.sonar/cache/
-          key: ${{ runner.os }}-sonar-${{ secrets.CACHE_VERSION }}
+          key: ${{ runner.os }}-sonar
 
       - name: Install PDF Clown
         run: |
-          ./install-pdf-clown.sh
+          ./scripts/install-deps.sh
 
       - name: Maven verify
         run: |
-          mvn verify -B -Pcoverage
+          ./mvnw -B verify -Pcoverage
 
       - name: Run Sonar analysis
         # see https://github.com/dependabot/dependabot-core/issues/3253#issuecomment-852541544
@@ -53,7 +54,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: >
-          mvn sonar:sonar -B
+          ./mvnw -B sonar:sonar
 
       - name: Upload JAR
         uses: actions/upload-artifact@v3
@@ -63,31 +64,30 @@ jobs:
 
       - name: Extract version
         id: extract-version
-        run: |
-          version=$(mvn help:evaluate -q -Dexpression=project.version -DforceStdout)
-          echo "::set-output name=version::${version}"
+        run: >
+          echo "version=$(./mvnw help:evaluate -q -Dexpression=project.version -DforceStdout)" >> $GITHUB_OUTPUT
 
   native-linux:
     needs: build
     runs-on: ubuntu-latest
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@v1
+        uses: gluonhq/setup-graalvm@6eecc74f9ad1f028b863d7a494e351668a1b0370
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          version: ${{ env.GRAALVM_VERSION }}
-          java-version: ${{ env.JAVA_VERSION }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          components: 'native-image'
+          graalvm: ${{ env.GRAALVM_VERSION }}
+          jdk: ${{ env.JAVA_VERSION }}
 
       - name: Cache Maven
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository/
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ secrets.CACHE_VERSION }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
 
       - name: Install libraries
         run: >
@@ -103,11 +103,11 @@ jobs:
 
       - name: Install PDF Clown
         run: |
-          ./install-pdf-clown.sh
+          ./scripts/install-deps.sh
 
       - name: Maven compile and link
         run: |
-          mvn gluonfx:build -B
+          ./mvnw -B gluonfx:build
 
       - name: Prepare native image for upload
         run: |
@@ -126,29 +126,29 @@ jobs:
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@v1
+        uses: gluonhq/setup-graalvm@6eecc74f9ad1f028b863d7a494e351668a1b0370
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          version: ${{ env.GRAALVM_VERSION }}
-          java-version: ${{ env.JAVA_VERSION }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          components: 'native-image'
+          graalvm: ${{ env.GRAALVM_VERSION }}
+          jdk: ${{ env.JAVA_VERSION }}
 
       - name: Cache Maven
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository/
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ secrets.CACHE_VERSION }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
 
       - name: Install PDF Clown
         run: |
-          ./install-pdf-clown.sh
+          ./scripts/install-deps.sh
 
       - name: Maven compile and link
         run: |
-          mvn gluonfx:build -B
+          ./mvnw -B gluonfx:build
 
       - name: Prepare native image for upload
         run: |
@@ -167,29 +167,35 @@ jobs:
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up MSBuild
+        uses: microsoft/setup-msbuild@v1
+
+      - name: Set up Visual Studio shell
+        uses: egor-tensin/vs-shell@v2
 
       - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@v1
+        uses: gluonhq/setup-graalvm@6eecc74f9ad1f028b863d7a494e351668a1b0370
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          version: ${{ env.GRAALVM_VERSION }}
-          java-version: ${{ env.JAVA_VERSION }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          components: 'native-image'
+          graalvm: ${{ env.GRAALVM_VERSION }}
+          jdk: ${{ env.JAVA_VERSION }}
 
       - name: Cache Maven
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository/
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ secrets.CACHE_VERSION }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
 
       - name: Install PDF Clown
         run: |
-          bash ./install-pdf-clown.sh
+          bash ./scripts/install-deps.sh
 
       - name: Maven compile and link
         run: |
-          mvn gluonfx:build -B
+          ./mvnw -B gluonfx:build
 
       - name: Prepare native image for upload
         run: |
@@ -214,7 +220,7 @@ jobs:
           name: artifacts
 
       - name: Create GitHub release
-        uses: softprops/action-gh-release@v0.1.14
+        uses: softprops/action-gh-release@v0.1.15
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true

diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![.github/workflows/build.yml](https://github.com/beatngu13/pdf-zoom-wizard/workflows/.github/workflows/build.yml/badge.svg)
+![Workflow status](https://github.com/beatngu13/pdf-zoom-wizard/actions/workflows//build.yml/badge.svg)
 [![Quality gate status](https://sonarcloud.io/api/project_badges/measure?project=beatngu13_pdf-zoom-wizard&metric=alert_status)](https://sonarcloud.io/dashboard?id=beatngu13_pdf-zoom-wizard)
 [![Total downloads status](https://img.shields.io/github/downloads/beatngu13/pdf-zoom-wizard/total.svg?style=flat)](https://github.com/beatngu13/pdf-zoom-wizard/releases)
 
@@ -8,7 +8,7 @@ A new and extended implementation of the [PDF Bookmark Wizard](https://bitbucket
 
 ## (Technical) Road Map
 
-The road map below shows the current project status from a technical point of view. Have a look at the [changelog](https://github.com/beatngu13/pdf-zoom-wizard/blob/master/CHANGELOG.md) for more details on past changes.
+The road map below shows the current project status from a technical point of view.
 
 - [x] Convert to Maven project
 - [x] Enhance build process with GitHub Actions