From 4436f2fe6a0d49e7f8d6b74a83c575396a669001 Mon Sep 17 00:00:00 2001
From: Miles Vella <673-vella@users.noreply.gitlab.cs.uni-duesseldorf.de>
Date: Thu, 9 Jan 2025 15:08:12 +0100
Subject: [PATCH] update minimum java version to 21

---
 .gitlab-ci.yml                 | 11 +----------
 README.md                      |  4 ++--
 build.gradle                   |  4 ++--
 doc/prob2ui_release_history.md |  4 ++++
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c846ef0bf..fbf8e0ee0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,20 +30,11 @@ stages:
     # otherwise texlive-latex-recommended would be enough.
     - apt-get install --assume-yes git pandoc texlive-latex-extra texlive-lang-german
 
-test:jdk-17-linux:
-  extends: .test-linux
-  image: eclipse-temurin:17-jammy
-  before_script:
-    - *default_before_script_linux
-    - apt-get install --assume-yes build-essential fakeroot
-  script:
-    - ./gradlew ${GRADLE_OPTIONS} check multiPlatformShadowJar jpackage
-
 test:jdk-21-linux:
   extends: .test-linux
   image: eclipse-temurin:21-jammy
   script:
-    - ./gradlew ${GRADLE_OPTIONS} check
+    - ./gradlew ${GRADLE_OPTIONS} check multiPlatformShadowJar jpackage
 
 test:jdk-21-macos-x86_64:
   extends: .test-common
diff --git a/README.md b/README.md
index d81f48791..3cf8185ab 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,10 @@ A short overview can be found [on our wiki](https://prob.hhu.de/w/index.php/ProB
 
 ## Requirements
 
-ProB 2 UI **requires Java 17** or later.
+ProB 2 UI **requires Java 21** or later.
 The last version compatible with older Java versions (down to Java 8) is [ProB 2 UI 1.2.1](https://github.com/hhu-stups/prob2_ui/blob/HEAD/doc/prob2ui_release_history.md#version-121-2023-08-15).
 
-Any OpenJDK 17 distribution can be used (we test with Eclipse Adoptium).
+Any OpenJDK 21 distribution can be used (we test with Eclipse Adoptium).
 JavaFX is included as a regular library dependency and does *not* need to be installed manually.
 
 ## Running from source
diff --git a/build.gradle b/build.gradle
index 592693caa..2c48ba707 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,7 @@ repositories {
 }
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
 }
 
 // Module export/open declarations for Java 9+
@@ -157,7 +157,7 @@ dependencies {
 }
 
 final osArch = System.getProperty("os.arch")
-final javafxVersion = "22.0.2"
+final javafxVersion = "23.0.1"
 
 final javafxModules = [
 	"javafx.base",
diff --git a/doc/prob2ui_release_history.md b/doc/prob2ui_release_history.md
index c128f5b6c..2f11e097f 100644
--- a/doc/prob2ui_release_history.md
+++ b/doc/prob2ui_release_history.md
@@ -11,6 +11,10 @@ Downloads of the current release and snapshot development builds can be found on
 * Added search to editor
 * Added language selection dropdown to interactive console
 
+**Note:** This is the last release to support Java 17. The next release will require Java 21 or newer. This only affects users of the multi-platform jar - consider using the platform-specific binaries, which have an appropriate JRE version bundled.
+
+**Note:** The multi-platform jar might not work on specific macOS architectures anymore - consider using the platform-specific binaries, which have an appropriate JRE version bundled.
+
 ## Version 1.2.1 (2023-08-15)
 
 * Updated the ProB core to version 1.12.2 - see the [ProB Release History](https://prob.hhu.de/w/index.php/ProB_Release_History)