Merge branch 'main' into add-checkerframework

Author: calixtus

.github/workflows/binaries.yml

@@ -154,16 +154,16 @@ jobs:
             archivePortableJabKit: 7z a -r jabkit/build/packages/windows-latest/jabkit-portable_windows.zip ./jabkit/build/packages/windows-latest/jabkit && rm -R jabkit/build/packages/windows-latest/jabkit
             suffix: ''
             archForDebianRepack: ''
-          - os: macos-13  # intel image
+          - os: macos-15-intel  # intel image
             displayName: macOS
-            archivePortable: 7z a -r jabgui/build/packages/macos-13/JabRef-portable_macos.zip ./jabgui/build/packages/macos-13/JabRef.app && rm -R jabgui/build/packages/macos-13/JabRef.app
-            archivePortableJabKit: 7z a -r jabkit/build/packages/macos-13/jabkit-portable_macos.zip ./jabkit/build/packages/macos-13/jabkit.app && rm -R jabkit/build/packages/macos-13/jabkit.app
+            archivePortable: 7z a -r jabgui/build/packages/macos-15-intel/JabRef-portable_macos.zip ./jabgui/build/packages/macos-15-intel/JabRef.app && rm -R jabgui/build/packages/macos-15-intel/JabRef.app
+            archivePortableJabKit: 7z a -r jabkit/build/packages/macos-15-intel/jabkit-portable_macos.zip ./jabkit/build/packages/macos-15-intel/jabkit.app && rm -R jabkit/build/packages/macos-15-intel/jabkit.app
             suffix: ''
             archForDebianRepack: ''
-          - os: macos-14
+          - os: macos-15
             displayName: macOS-arm
-            archivePortable: 7z a -r jabgui/build/packages/macos-14/JabRef-portable_macos-arm.zip ./jabgui/build/packages/macos-14/JabRef.app && rm -R jabgui/build/packages/macos-14/JabRef.app
-            archivePortableJabKit: 7z a -r jabkit/build/packages/macos-14/jabkit-portable_macos-arm.zip ./jabkit/build/packages/macos-14/jabkit.app && rm -R jabkit/build/packages/macos-14/jabkit.app
+            archivePortable: 7z a -r jabgui/build/packages/macos-15/JabRef-portable_macos-arm.zip ./jabgui/build/packages/macos-15/JabRef.app && rm -R jabgui/build/packages/macos-15/JabRef.app
+            archivePortableJabKit: 7z a -r jabkit/build/packages/macos-15/jabkit-portable_macos-arm.zip ./jabkit/build/packages/macos-15/jabkit.app && rm -R jabkit/build/packages/macos-15/jabkit.app
             suffix: '_arm64'
             archForDebianRepack: ''
     runs-on: ${{ matrix.os }}
@@ -396,10 +396,10 @@ jobs:
       max-parallel: 1
       matrix:
         include:
-          - os: macos-14
+          - os: macos-15
             displayName: macOS (ARM64)
             suffix: '_arm64'
-          - os: macos-13  # intel image
+          - os: macos-15-intel  # intel image
             displayName: macOS
             suffix: ''
     runs-on: ${{ matrix.os }}

build-logic/src/main/kotlin/org.jabref.gradle.base.targets.gradle.kts

@@ -25,13 +25,13 @@ javaModulePackaging {
         architecture = MachineArchitecture.ARM64
         packageTypes = listOf("app-image", "deb", "rpm")
     }
-    target("macos-13") {
+    target("macos-15-intel") {
         operatingSystem = OperatingSystemFamily.MACOS
         architecture = MachineArchitecture.X86_64
         packageTypes = listOf("app-image", "dmg", "pkg")
         singleStepPackaging = true
     }
-    target("macos-14") {
+    target("macos-15") {
         operatingSystem = OperatingSystemFamily.MACOS
         architecture = MachineArchitecture.ARM64
         packageTypes = listOf("app-image", "dmg", "pkg")