Merge branch 'patschuh:develop' into develop

.github/workflows/gradle.yaml

@@ -7,86 +7,87 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-11, ubuntu-20.04, windows-2019 ]
+        os: [ macos-12, ubuntu-22.04, windows-2022 ]
         java: [ '17' ]
       fail-fast: false
     name: ${{ matrix.os }}
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
           java-package: jdk+fx
+          cache: 'gradle'
       - name: Echo JAVA_HOME
         run: echo $JAVA_HOME
       - name: Verify Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: Execute build (macOs & Ubuntu)
-        if: matrix.os != 'windows-2019'
+      - name: Execute build (macOS & Ubuntu)
+        if: matrix.os != 'windows-2022'
         run: ./gradlew --info build
       - name: Execute build (Windows)
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-2022'
         run: .\gradlew.bat --info build
       - name: Upload TAR as an artifact
-        if: matrix.os != 'windows-2019'
-        uses: actions/upload-artifact@v2
+        if: matrix.os != 'windows-2022'
+        uses: actions/upload-artifact@v3
         with:
           name: kafkaesque-jdk${{ matrix.java }}-${{ matrix.os }}-tar
           path: build/distributions/*.tar
       - name: Upload ZIP as an artifact
-        if: matrix.os == 'windows-2019'
-        uses: actions/upload-artifact@v2
+        if: matrix.os == 'windows-2022'
+        uses: actions/upload-artifact@v3
         with:
           name: kafkaesque-jdk${{ matrix.java }}-${{ matrix.os }}-zip
           path: build/distributions/*.zip
-      - name: Execute runtime (macOs & Ubuntu)
-        if: matrix.os != 'windows-2019'
+      - name: Execute runtime (macOS & Ubuntu)
+        if: matrix.os != 'windows-2022'
         run: ./gradlew --info runtime
       - name: Execute runtime (Windows)
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-2022'
         run: .\gradlew.bat --info runtime
-      - name: Execute jpackage (macOs & Ubuntu)
-        if: matrix.os != 'windows-2019'
+      - name: Execute jpackage (macOS & Ubuntu)
+        if: matrix.os != 'windows-2022'
         run: ./gradlew --info jpackage
       - name: Execute jpackage (Windows)
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-2022'
         run: .\gradlew.bat --info jpackage
       - name: Upload DMG as an artifact
-        if: matrix.os == 'macos-11'
-        uses: actions/upload-artifact@v2
+        if: matrix.os == 'macos-12'
+        uses: actions/upload-artifact@v3
         with:
           name: kafkaesque-jdk${{ matrix.java }}-${{ matrix.os }}-dmg
           path: build/jpackage/*.dmg
       - name: Upload PKG as an artifact
-        if: matrix.os == 'macos-11'
-        uses: actions/upload-artifact@v2
+        if: matrix.os == 'macos-12'
+        uses: actions/upload-artifact@v3
         with:
           name: kafkaesque-jdk${{ matrix.java }}-${{ matrix.os }}-pkg
           path: build/jpackage/*.pkg
       - name: Upload DEB as an artifact
-        if: matrix.os == 'ubuntu-20.04'
-        uses: actions/upload-artifact@v2
+        if: matrix.os == 'ubuntu-22.04'
+        uses: actions/upload-artifact@v3
         with:
           name: kafkaesque-jdk${{ matrix.java }}-${{ matrix.os }}-deb
           path: build/jpackage/*.deb
       - name: Upload RPM as an artifact
-        if: matrix.os == 'ubuntu-20.04'
-        uses: actions/upload-artifact@v2
+        if: matrix.os == 'ubuntu-22.04'
+        uses: actions/upload-artifact@v3
         with:
           name: kafkaesque-jdk${{ matrix.java }}-${{ matrix.os }}-rpm
           path: build/jpackage/*.rpm
       - name: Upload EXE as an artifact
-        if: matrix.os == 'windows-2019'
-        uses: actions/upload-artifact@v2
+        if: matrix.os == 'windows-2022'
+        uses: actions/upload-artifact@v3
         with:
           name: kafkaesque-jdk${{ matrix.java }}-${{ matrix.os }}-exe
           path: build/jpackage/*.exe
       - name: Upload MSI as an artifact
-        if: matrix.os == 'windows-2019'
-        uses: actions/upload-artifact@v2
+        if: matrix.os == 'windows-2022'
+        uses: actions/upload-artifact@v3
         with:
           name: kafkaesque-jdk${{ matrix.java }}-${{ matrix.os }}-msi
           path: build/jpackage/*.msi
@@ -96,19 +97,19 @@ jobs:
           codesign --sign - --deep --force --preserve-metadata=entitlements,requirements,flags,runtime build/jpackage/*.dmg
         if: |
           startsWith(github.ref, 'refs/tags/') &&
-          matrix.os == 'macos-11'
+          matrix.os == 'macos-12'
       - name: Create release (macOS)
         uses: softprops/action-gh-release@v1
         if: |
           startsWith(github.ref, 'refs/tags/') &&
-          matrix.os == 'macos-11'
+          matrix.os == 'macos-12'
         with:
           files: build/jpackage/*.dmg
       - name: Create release (Ubuntu)
         uses: softprops/action-gh-release@v1
         if: |
           startsWith(github.ref, 'refs/tags/') &&
-          matrix.os == 'ubuntu-20.04'
+          matrix.os == 'ubuntu-22.04'
         with:
           files: |
             build/jpackage/*.deb
@@ -117,6 +118,29 @@ jobs:
         uses: softprops/action-gh-release@v1
         if: |
           startsWith(github.ref, 'refs/tags/') &&
-          matrix.os == 'windows-2019'
+          matrix.os == 'windows-2022'
         with:
           files: build/jpackage/*.exe
+      - name: Extract version (macOS)
+        id: extract-version
+        if: |
+          startsWith(github.ref, 'refs/tags/') &&
+          matrix.os == 'macos-12'
+        run: |
+          TAG_NAME=${GITHUB_REF#refs/tags/}
+          echo "tag-name=${TAG_NAME:1}" >> $GITHUB_OUTPUT
+      - name: Bump Homebrew cask version (macOS)
+        uses: MWin123/bump-homebrew-formula-action@v0.3.0
+        if: |
+          startsWith(github.ref, 'refs/tags/') &&
+          matrix.os == 'macos-12'
+        with:
+          formula-name: homebrew-esque
+          formula-path: Casks/kafkaesque.rb
+          homebrew-tap: patschuh/homebrew-esque
+          base-branch: main
+          create-pullrequest: true
+          tag-name: ${{ steps.extract-version.outputs.tag-name }}
+          download-url: https://github.com/patschuh/KafkaEsque/releases/download/v${{ steps.extract-version.outputs.tag-name }}/KafkaEsque-${{ steps.extract-version.outputs.tag-name }}.dmg
+        env:
+          COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}

build.gradle

@@ -1,5 +1,6 @@
 import org.gradle.internal.jvm.Jvm
 import org.gradle.internal.os.OperatingSystem
+
 import java.text.SimpleDateFormat
 
 plugins {
@@ -10,7 +11,7 @@ plugins {
 }
 
 group = 'at.esque.kafka'
-version = '2.3.1'
+version = '2.7.3'
 
 repositories {
     mavenCentral()
@@ -39,8 +40,9 @@ dependencies {
     implementation 'org.kordamp.ikonli:ikonli-javafx:12.2.0'
     implementation 'org.kordamp.ikonli:ikonli-fontawesome-pack:12.2.0'
     implementation 'com.opencsv:opencsv:5.5.2'
-    implementation 'io.confluent:kafka-schema-registry:6.2.7'
+    implementation 'io.confluent:kafka-schema-registry:7.3.0'
     implementation 'io.confluent:kafka-avro-serializer:6.2.7'
+    implementation 'io.confluent:kafka-protobuf-serializer:6.2.7'
     implementation 'org.apache.avro:avro:1.11.1'
     implementation 'com.google.inject:guice:5.0.1'
     implementation 'org.fxmisc.richtext:richtextfx:0.10.7'
@@ -87,6 +89,8 @@ runtime {
 
         def currentOs = OperatingSystem.current()
         def imgType = currentOs.windows ? 'ico' : currentOs.macOsX ? 'icns' : 'png'
+
+        jvmArgs += ['-Dprism.dirtyopts=false']
         imageOptions += ['--icon', "src/main/resources/icons/package/KafkaEsque.$imgType"]
         installerOptions += ['--resource-dir', "src/main/resources"]
         installerOptions += ['--vendor', 'Patrick Schuh']

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'kafkaesque'
+rootProject.name = 'KafkaEsque'