Build with Java 25

Author: bobbylight

.github/workflows/codeql-analysis.yml

@@ -37,10 +37,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
 
       # Initializes the CodeQL tools for scanning.

.github/workflows/gradle.yml

@@ -16,14 +16,14 @@ jobs:
 
     strategy:
       matrix:
-        java: [ '21', '25' ]
+        java: [ '25' ]
 
     steps:
     - uses: actions/checkout@v6
 
     - name: Verify gradle wrapper
       uses: gradle/actions/wrapper-validation@v4
-      if: matrix.java == '21'
+      if: matrix.java == '25'
 
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v5

MakeRTextInstaller.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "RText"
-!define PRODUCT_VERSION "6.0.3"
+!define PRODUCT_VERSION "6.1.0"
 !define PRODUCT_WEB_SITE "https://bobbylight.github.io/RText/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RText.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -97,7 +97,8 @@ Section Uninstall
   RMDir /r "$INSTDIR\jre-17.0.2"   ; From prior installs
   RMDir /r "$INSTDIR\jre-17.0.5"   ; From prior installs
   RMDir /r "$INSTDIR\jre-17.0.6"   ; From prior installs
-  RMDir /r "$INSTDIR\jre-17.0.8"
+  RMDir /r "$INSTDIR\jre-17.0.8"   ; From prior installs
+  RMDir /r "$INSTDIR\jre-25.0.1"
   RMDir /r "$INSTDIR\lnfs"         ; From prior installs
   RMDir /r "$INSTDIR\plugins"
   Delete /REBOOTOK "$INSTDIR\RText.*"

README.md

@@ -30,7 +30,7 @@ all unit tests, and create the jar, and run:
     ./gradlew build installDist
     java -jar build/install/rtext/RText.jar
 
-Note that RText requires Java 21 or later to build.
+Note that RText requires Java 25 or later to build.
 
 ### Building the Windows application and installer
 

build.gradle

@@ -14,9 +14,9 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin'
 
 group = 'com.fifesoft'
 ext.isReleaseVersion = !project.version.endsWith('SNAPSHOT')
-// Note: Local JDK 21: /Library/Java/JavaVirtualMachines/jdk-21.0.5+11/Contents/Home
+// Note: Local JDK 25: /Library/Java/JavaVirtualMachines/jdk-25.0.1+8/Contents/Home
 
-assert JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)
+assert JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_25)
 
 configurations.all { // Check for updates every build
 	resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
@@ -423,7 +423,8 @@ generateWindowsStarterExe.dependsOn('generateWindowsJre')
 
 task generateMacApp {
 	doLast {
-		exec {
+		def execOps = services.get(org.gradle.process.ExecOperations)
+		execOps.exec {
 			commandLine '/bin/bash', '-c', './mac/build-mac-app.sh'
 		}
 	}

gradle.properties

@@ -1,14 +1,14 @@
 # Note that Maven- and signing-related properties are in <maven-home>/gradle.properties
-javaReleaseVersion=21
-version=6.0.3-SNAPSHOT
+javaReleaseVersion=25
+version=6.1.0-SNAPSHOT
 
 # The JDK to use when generating the embedded JRE
 #jdkRoot=C:/java/jdk-17.0.8
 #export JAVA_HOME=/c/java/jdk-17.0.8
-jdkRoot=/Library/Java/JavaVirtualMachines/jdk-21.0.5+11/Contents/Home
-#export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-21.0.5+11/Contents/Home
+jdkRoot=/Library/Java/JavaVirtualMachines/jdk-25.0.1+8/Contents/Home
+#export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-25.0.1+8/Contents/Home
 
 # The folder to store the embedded JRE in (Windows only)
-embeddedJreFolderName=jre-17.0.8
+embeddedJreFolderName=jre-25.0.1
 
 launch4jExe=C:/Progra~2/Launch4j/launch4jc.exe

launch4j.xml

@@ -15,7 +15,7 @@
   <manifest></manifest>
   <icon>rtext.ico</icon>
   <jre>
-    <path>jre-17.0.8</path>
+    <path>jre-25.0.1</path>
     <bundledJre64Bit>true</bundledJre64Bit>
     <bundledJreAsFallback>false</bundledJreAsFallback>
     <minVersion></minVersion>

mac/build-mac-app.sh

@@ -8,7 +8,7 @@
 
 # The version of RText you're building.  This appears in the generated
 # .dmg file name.
-APP_VERSION=6.0.3
+APP_VERSION=6.1.0
 
 #
 # You probably don't want to change anything below this line.

src/main/dist/doc/en/Changes.txt

@@ -2,9 +2,9 @@ RText Change Log
 https://bobbylight.github.io/RText/
 -----------------------------------
 
-6.0.3
+6.1.0
 ------------------
-   - Updating bundled JRE from 17 to 21
+   - Updating bundled JRE from 17 to 25
    -
 
 6.0.2 (08/05/2023)

src/main/java/org/fife/rtext/RText.java

@@ -169,7 +169,7 @@ public class RText extends AbstractPluggableGUIApplication<RTextPrefs>
 	 */
 	private static final String PROPERTY_PRINT_START_TIMES = "printStartTimes";
 
-	public static final String VERSION_STRING		= "6.0.3";
+	public static final String VERSION_STRING		= "6.1.0";
 
 
 	/**