Update Java to 21 (#1149)

* Update Java to 21

* Update Readme

.github/workflows/build_pull_request.yml

@@ -32,10 +32,10 @@ jobs:
           path: master
           fetch-depth: 0
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 21
           distribution: 'temurin'
 
       - name: Setup Gradle

.github/workflows/build_push.yml

@@ -32,10 +32,10 @@ jobs:
           path: master
           fetch-depth: 0
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 21
           distribution: 'temurin'
 
       - name: Setup Gradle
@@ -88,7 +88,6 @@ jobs:
           - macOS-x64
           - macOS-arm64
           - windows-x64
-          - windows-x86
 
     name: Make ${{ matrix.os }} release
     needs: build
@@ -156,10 +155,6 @@ jobs:
         with:
           name: windows-x64
           path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: windows-x86
-          path: release
 
       - name: Checkout Preview branch
         uses: actions/checkout@v4

.github/workflows/publish.yml

@@ -33,10 +33,10 @@ jobs:
           path: master
           fetch-depth: 0
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 21
           distribution: 'temurin'
 
       - name: Setup Gradle
@@ -90,7 +90,6 @@ jobs:
           - macOS-x64
           - macOS-arm64
           - windows-x64
-          - windows-x86
 
     name: Make ${{ matrix.os }} release
     needs: build
@@ -159,10 +158,6 @@ jobs:
         with:
           name: windows-x64
           path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: windows-x86
-          path: release
 
       - name: Generate checksums
         run: cd release && sha256sum * > Checksums.sha256

README.md

@@ -79,7 +79,7 @@ To facilitate the use of Suwayomi we provide bundle releases that include The Ja
 If a bundle for your operating system or cpu architecture is not provided then refer to [Advanced Methods](#advanced-methods)
 
 ### Windows
-Download the latest `win32`(Windows 32-bit) or `win64`(Windows 64-bit) release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases).
+Download the latest `win64`(Windows 64-bit) release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases).
 
 Unzip the downloaded file and double-click on one of the launcher scripts.
 
@@ -137,7 +137,7 @@ You can also directly use the package from [nixpkgs](https://search.nixos.org/pa
 ### Running the jar release directly
 In order to run the app you need the following:
 - The jar release of Suwayomi-Server
-- The Java Runtime Environment(JRE) 8 or newer
+- The Java Runtime Environment(JRE) 21 or newer
 - A Browser like Google Chrome, Firefox, Edge, etc.
 - ElectronJS (optional)
 

build.gradle.kts

@@ -27,8 +27,8 @@ allprojects {
 subprojects {
     plugins.withType<JavaPlugin> {
         extensions.configure<JavaPluginExtension> {
-            sourceCompatibility = JavaVersion.VERSION_1_8
+            sourceCompatibility = JavaVersion.VERSION_21
-            targetCompatibility = JavaVersion.VERSION_1_8
+            targetCompatibility = JavaVersion.VERSION_21
         }
     }
 
@@ -45,7 +45,7 @@ subprojects {
         withType<KotlinJvmCompile> {
             dependsOn("ktlintFormat")
             compilerOptions {
-                jvmTarget = JvmTarget.JVM_1_8
+                jvmTarget = JvmTarget.JVM_21
                 freeCompilerArgs.add("-Xcontext-receivers")
             }
         }

renovate.json

@@ -14,7 +14,7 @@
         "JRE_RELEASE=[\"'](?<currentValue>.+?)[\"']\\s+"
       ],
       "datasourceTemplate": "github-releases",
-      "depNameTemplate": "adoptium/temurin8-binaries",
+      "depNameTemplate": "adoptium/temurin21-binaries",
       "versioningTemplate": "regex:^jdk-?(?<major>\\d+).(?<minor>\\d+).+?(?<patch>[\\d+]+)$"
     }
   ]

scripts/bundler.sh

@@ -51,11 +51,11 @@ main() {
       move_release_to_output_dir
       ;;
     linux-x64)
-      # https://github.com/adoptium/temurin8-binaries/releases/
+      # https://github.com/adoptium/temurin21-binaries/releases/
-      JRE_RELEASE="jdk8u392-b08"
+      JRE_RELEASE="jdk-21.0.5+11"
-      JRE="OpenJDK8U-jre_x64_linux_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g').tar.gz"
+      JRE="OpenJDK21U-jre_x64_linux_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g;s/+/_/g').tar.gz"
       JRE_DIR="$JRE_RELEASE-jre"
-      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/$JRE_RELEASE/$JRE"
+      JRE_URL="https://github.com/adoptium/temurin21-binaries/releases/download/$JRE_RELEASE/$JRE"
       ELECTRON="electron-$electron_version-linux-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_jre_and_electron
@@ -65,11 +65,11 @@ main() {
       move_release_to_output_dir
       ;;
     macOS-x64)
-      # https://github.com/adoptium/temurin8-binaries/releases/
+      # https://github.com/adoptium/temurin21-binaries/releases/
-      JRE_RELEASE="jdk8u392-b08"
+      JRE_RELEASE="jdk-21.0.5+11"
-      JRE="OpenJDK8U-jre_x64_mac_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g').tar.gz"
+      JRE="OpenJDK21U-jre_x64_mac_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g;s/+/_/g').tar.gz"
       JRE_DIR="$JRE_RELEASE-jre"
-      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/$JRE_RELEASE/$JRE"
+      JRE_URL="https://github.com/adoptium/temurin21-binaries/releases/download/$JRE_RELEASE/$JRE"
       ELECTRON="electron-$electron_version-darwin-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_jre_and_electron
@@ -79,11 +79,11 @@ main() {
       move_release_to_output_dir
       ;;
     macOS-arm64)
-      # https://cdn.azul.com/zulu/bin/
+      # https://github.com/adoptium/temurin21-binaries/releases/
-      JRE="zulu8.74.0.17-ca-jre8.0.392-macosx_aarch64.tar.gz"
+      JRE_RELEASE="jdk-21.0.5+11"
-      JRE_RELEASE="zulu8.74.0.17-ca-jre8.0.392-macosx_aarch64"
+      JRE="OpenJDK21U-jre_aarch64_mac_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g;s/+/_/g').tar.gz"
-      JRE_DIR="$JRE_RELEASE/zulu-8.jre"
+      JRE_DIR="$JRE_RELEASE-jre"
-      JRE_URL="https://cdn.azul.com/zulu/bin/$JRE"
+      JRE_URL="https://github.com/adoptium/temurin21-binaries/releases/download/$JRE_RELEASE/$JRE"
       ELECTRON="electron-$electron_version-darwin-arm64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_jre_and_electron
@@ -92,30 +92,12 @@ main() {
       make_macos_bundle
       move_release_to_output_dir
       ;;
-    windows-x86)
-      # https://github.com/adoptium/temurin8-binaries/releases/
-      JRE_RELEASE="jdk8u392-b08"
-      JRE="OpenJDK8U-jre_x86-32_windows_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g').zip"
-      JRE_DIR="$JRE_RELEASE-jre"
-      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/$JRE_RELEASE/$JRE"
-      ELECTRON="electron-$electron_version-win32-ia32.zip"
-      ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
-      download_jre_and_electron
-
-      RELEASE="$RELEASE_NAME.zip"
-      make_windows_bundle
-      move_release_to_output_dir
-
-      RELEASE="$RELEASE_NAME.msi"
-      make_windows_package
-      move_release_to_output_dir
-      ;;
     windows-x64)
-      # https://github.com/adoptium/temurin8-binaries/releases/
+      # https://github.com/adoptium/temurin21-binaries/releases/
-      JRE_RELEASE="jdk8u392-b08"
+      JRE_RELEASE="jdk-21.0.5+11"
-      JRE="OpenJDK8U-jre_x64_windows_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g').zip"
+      JRE="OpenJDK21U-jre_x64_windows_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g;s/+/_/g').zip"
       JRE_DIR="$JRE_RELEASE-jre"
-      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/$JRE_RELEASE/$JRE"
+      JRE_URL="https://github.com/adoptium/temurin21-binaries/releases/download/$JRE_RELEASE/$JRE"
       ELECTRON="electron-$electron_version-win32-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_jre_and_electron

scripts/resources/deb/control

@@ -8,7 +8,7 @@ Homepage: https://github.com/Suwayomi/Suwayomi-Server
 
 Package: suwayomi-server
 Architecture: all
-Depends: ${misc:Depends}, java8-runtime, libc++-dev
+Depends: ${misc:Depends}, openjdk-21-jre, libc++-dev
 Description: Manga Reader
  A free and open source manga reader server that runs extensions built for Tachiyomi.
  Suwayomi is an independent Tachiyomi compatible software and is not a Fork of Tachiyomi.