Update graphqlkotlin to v10.1.2

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -42,7 +42,7 @@ body:
       label: Suwayomi-Server version
       description: You can find your Suwayomi-Server version in **More → About**.
       placeholder: |
-        Example: "v2.3.2230"
+        Example: "v2.3.2226"
     validations:
       required: true
 

CHANGELOG.md

@@ -15,13 +15,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Fixed
 - .
 
-## [v2.3.2230] - 2026-07-01
+## [v2.3.2226] - 2026-07-01
 
 ### Fixed
 - (**Extension/API**) Fix GQL handling of extensions without an extension store
 - (**Build/Bundler**) Fix build continuing if errors happen
-- (**Build/Bundler**) Remove jogamp from build script
-- (**Build/Bundler**) Fix chmod attempts on Windows Java
 
 ## [v2.3.2223] + [WebUI: v20260509.01] - 2026-06-30
 
@@ -486,8 +484,8 @@ Huge thanks to @martinek who pulled the most of the weight this release!
 
 <!-- SERVER LINKS -->
 
-[unreleased]: https://github.com/suwayomi/suwayomi-server/compare/v2.3.2230...HEAD
-[v2.3.2230]: https://github.com/suwayomi/suwayomi-server/compare/v2.3.2223...v2.3.2230
+[unreleased]: https://github.com/suwayomi/suwayomi-server/compare/v2.3.2226...HEAD
+[v2.3.2226]: https://github.com/suwayomi/suwayomi-server/compare/v2.3.2223...v2.3.2226
 [v2.3.2223]: https://github.com/suwayomi/suwayomi-server/compare/v2.2.2100...v2.3.2223
 [v2.2.2100]: https://github.com/suwayomi/suwayomi-server/compare/v2.1.1867...v2.2.2100
 [v2.1.1867]: https://github.com/suwayomi/suwayomi-server/compare/v2.0.1727...v2.1.1867

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ dex2jar = "2.4.37"
 polyglot = "25.0.3"
 settings = "1.3.0"
 twelvemonkeys = "3.13.1"
-graphqlkotlin = "10.0.0"
+graphqlkotlin = "10.1.2"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
 koin = "4.2.2"

scripts/bundler.sh

@@ -49,6 +49,7 @@ main() {
   case "$OS" in
     debian-all)
       RELEASE="$RELEASE_NAME.deb"
+      download_jogamp "linux-*" # it's easier to bundle them ourselves than to handle Debian's path conventions
       make_deb_package
       move_release_to_output_dir
       ;;
@@ -56,6 +57,7 @@ main() {
       JRE="$ZULU_RELEASE-ca-$JRE_RELEASE-linux_x64.zip"
       JRE_DIR="${JRE%.*}"
       JRE_URL="https://cdn.azul.com/zulu/bin/$JRE"
+      download_jogamp "linux-amd64"
       setup_jre
 
       RELEASE="$RELEASE_NAME.AppImage"
@@ -75,6 +77,7 @@ main() {
       ELECTRON="electron-$electron_version-linux-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_electron
+      download_jogamp "linux-amd64"
       setup_jre
       tree "$RELEASE_NAME"
 
@@ -89,6 +92,7 @@ main() {
       ELECTRON="electron-$electron_version-darwin-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_electron
+      download_jogamp "macosx-universal"
       setup_jre
       tree "$RELEASE_NAME"
 
@@ -103,6 +107,7 @@ main() {
       ELECTRON="electron-$electron_version-darwin-arm64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_electron
+      download_jogamp "macosx-universal"
       setup_jre
       tree "$RELEASE_NAME"
 
@@ -117,6 +122,7 @@ main() {
       ELECTRON="electron-$electron_version-win32-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_electron
+      download_jogamp "windows-amd64"
       setup_jre
       tree "$RELEASE_NAME"
 
@@ -151,6 +157,18 @@ download_launcher() {
   mv "Suwayomi-Launcher.jar" "$RELEASE_NAME/Suwayomi-Launcher.jar" || error $LINENO "Failed to move launcher JAR" 1
 }
 
+download_jogamp() {
+  local platform="$1"
+  if [ ! -f jogamp-all-platforms.7z ]; then
+    curl -f "https://jogamp.org/deployment/jogamp-current/archive/jogamp-all-platforms.7z" -o jogamp-all-platforms.7z || error $LINENO "Failed to download jogamp archive" 1
+  fi
+
+  7z x jogamp-all-platforms.7z "jogamp-all-platforms/lib/$platform/" || error $LINENO "Failed to extract jogamp archive" 1
+  mkdir -p "$RELEASE_NAME/natives/"
+  mv jogamp-all-platforms/lib/* "$RELEASE_NAME/natives/" || error $LINENO "Failed to move natives" 1
+  rm -rf jogamp-all-platforms
+}
+
 download_electron() {
   if [ ! -f "$ELECTRON" ]; then
     curl -fL "$ELECTRON_URL" -o "$ELECTRON" || error $LINENO "Failed to download electron" 1
@@ -161,10 +179,8 @@ download_electron() {
 
 setup_jre() {
   if [ -d "jre" ]; then
-    if [ ! -f "./jre/bin/java.exe" ]; then
-      chmod +x ./jre/bin/java || error $LINENO "Failed to set java executable permission" 1
-      chmod +x ./jre/lib/jspawnhelper || error $LINENO "Failed to set jspawnhelper executable permission" 1
-    fi
+    chmod +x ./jre/bin/java || error $LINENO "Failed to set java executable permission" 1
+    chmod +x ./jre/lib/jspawnhelper || error $LINENO "Failed to set jspawnhelper executable permission" 1
     mv "jre" "$RELEASE_NAME/jre" || error $LINENO "Failed to move jre" 1
   else
     if [ ! -f "$JRE" ]; then
@@ -178,11 +194,6 @@ setup_jre() {
       tar xvf "$JRE" || error $LINENO "Failed to extract JRE tar" 1
     fi
     mv "$JRE_DIR" "$RELEASE_NAME/jre" || error $LINENO "Failed to move extracted JRE" 1
-
-    if [ ! -f "$RELEASE_NAME/jre/bin/java.exe" ]; then
-      chmod +x "$RELEASE_NAME/jre/bin/java" || error $LINENO "Failed to set java executable permission" 1
-      chmod +x "$RELEASE_NAME/jre/lib/jspawnhelper" || error $LINENO "Failed to set jspawnhelper executable permission" 1
-    fi
   fi
 }
 
@@ -226,6 +237,7 @@ make_deb_package() {
   local upstream_source="suwayomi-server_$RELEASE_VERSION.orig.tar.gz"
 
   mkdir "$RELEASE_NAME/$source_dir/" || error $LINENO "Failed to create source directory" 1
+  mv "$RELEASE_NAME/natives" "$RELEASE_NAME/$source_dir/natives" || error $LINENO "Failed to move natives" 1
   mv "$RELEASE_NAME/Suwayomi-Launcher.jar" "$RELEASE_NAME/$source_dir/Suwayomi-Launcher.jar" || error $LINENO "Failed to move launcher jar" 1
   cp "$JAR" "$RELEASE_NAME/$source_dir/Suwayomi-Server.jar" || error $LINENO "Failed to copy server jar" 1
   copy_linux_package_assets_to "$RELEASE_NAME/$source_dir/"
@@ -317,6 +329,9 @@ make_windows_package() {
   find "$RELEASE_NAME/electron" \
   | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
     --directory-ref electron --component-group electron >"$RELEASE_NAME/electron.wxs" || error $LINENO "Failed to heat electron" 1
+  find "$RELEASE_NAME/natives" \
+  | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
+    --directory-ref natives --component-group natives >"$RELEASE_NAME/natives.wxs" || error $LINENO "Failed to heat natives" 1
 
   find "$RELEASE_NAME/bin" \
   | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
@@ -327,7 +342,7 @@ make_windows_package() {
 
   wixl -D ProductVersion="$RELEASE_VERSION" -D SourceDir="$RELEASE_NAME" \
     -D Icon="$icon" --arch "$arch" "scripts/resources/msi/suwayomi-server-$arch.wxs" \
-    "$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" "$RELEASE_NAME/bin.wxs" -o "$RELEASE" || error $LINENO "Windows package build failed" 1
+    "$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" "$RELEASE_NAME/natives.wxs" "$RELEASE_NAME/bin.wxs" -o "$RELEASE" || error $LINENO "Windows package build failed" 1
 }
 
 # Error handler

scripts/resources/deb/install

@@ -2,6 +2,7 @@
 
 Suwayomi-Server.jar         usr/share/java/suwayomi-server/bin/
 Suwayomi-Launcher.jar       usr/share/java/suwayomi-server/
+natives/*                   usr/share/java/suwayomi-server/natives/
 suwayomi-server.png         usr/share/pixmaps/
 suwayomi-server.desktop     usr/share/applications/
 suwayomi-launcher.desktop   usr/share/applications/

scripts/resources/msi/suwayomi-server-x64.wxs

@@ -17,6 +17,7 @@
         <Directory Id="INSTALLDIR" Name="Suwayomi-Server" >
           <Directory Id="jre"/>
           <Directory Id="electron"/>
+          <Directory Id="natives"/>
           <Directory Id="bin"/>
         </Directory>
       </Directory>
@@ -62,6 +63,7 @@
       <ComponentRef Id="SuwayomiLauncherBAT" />
       <ComponentRef Id="ProgramMenuDir" />
       <ComponentGroupRef Id="electron" />
+      <ComponentGroupRef Id="natives" />
     </Feature>
 
     <Icon Id="Suwayomi.ico" SourceFile="$(var.Icon)" />