Bump gradle to 8.13 and build with Java 17

bobbylight · bobbylight · commit 1b2f145cc3be · 2025-03-24T09:11:20.000-04:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -35,17 +35,17 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: '8'
-        distribution: 'adopt'
+        java-version: '17'
+        distribution: 'temurin'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,12 +65,10 @@ jobs:
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
 
+    # Note: Assumes we're running on Ubuntu
+    # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
     - name: Build
-      #run: ./gradlew build --warning-mode all
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        run: ./gradlew build -xsign --warning-mode all
-        working-directory: ./ #optional
+      run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -16,23 +16,25 @@ jobs:
 
     strategy:
       matrix:
-        java: [ '8', '11', '14', '17']
+        java: [ '17', '21', '23' ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
+      - name: Verify gradle wrapper
+        uses: gradle/actions/wrapper-validation@v4
+        if: matrix.java == '17'
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'temurin'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      # Note: Assumes we're running on Ubuntu
+      # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
       - name: Build with Gradle
-        #run: ./gradlew build --warning-mode all
-        uses: GabrielBB/xvfb-action@v1
-        with:
-          run: ./gradlew build -xsign -xpublish --warning-mode all
-          working-directory: ./ #optional
+        run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all
diff --git a/RSTAUI/build.gradle b/RSTAUI/build.gradle
@@ -2,34 +2,37 @@ plugins {
     id 'java-library'
 }
 
-['distribution', 'maven-publish', 'signing'].each { apply plugin: it }
+['base', 'distribution', 'maven-publish', 'signing'].each { apply plugin: it }
 
-assert JavaVersion.current().isJava8Compatible()
-
-archivesBaseName = 'rstaui'
+base {
+    archivesName = 'rstaui'
+}
 
 dependencies {
-    api 'com.fifesoft:rsyntaxtextarea:3.3.2'
-    api 'com.fifesoft:autocomplete:3.3.1'
+    api 'com.fifesoft:rsyntaxtextarea:3.5.4'
+    api 'com.fifesoft:autocomplete:3.3.2'
+    testImplementation platform('org.junit:junit-bom:5.12.1')
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 ext.isReleaseVersion = !project.version.endsWith('SNAPSHOT')
 
-ext.sharedManifest = manifest {
-	attributes('Class-Path': 'rsyntaxtextarea.jar autocomplete.jar',
-		'Specification-Title': 'RSTAUI',
-		'Specification-Version': version,
-		'Implementation-Title': 'org.fife.ui',
-		'Implementation-Version': version)
-
-}
-
 java {
     withSourcesJar()
     withJavadocJar()
 }
 jar {
-	manifest { from sharedManifest }
+	manifest {
+        manifest {
+            attributes('Class-Path': 'rsyntaxtextarea.jar autocomplete.jar',
+                    'Specification-Title': 'RSTAUI',
+                    'Specification-Version': version,
+                    'Implementation-Title': 'org.fife.ui',
+                    'Implementation-Version': version)
+
+        }
+    }
 }
 
 publishing {
@@ -86,7 +89,7 @@ publishing {
 
 signing {
     // Don't require signing for e.g. ./gradlew install
-    required { gradle.taskGraph.hasTask('publish') && isReleaseVersion }
+    required = { gradle.taskGraph.hasTask('publish') && isReleaseVersion }
     sign publishing.publications.maven
 }
 tasks.withType(Sign) {
diff --git a/RSTAUI/src/main/java/org/fife/rsta/ui/AssistanceIconPanel.java b/RSTAUI/src/main/java/org/fife/rsta/ui/AssistanceIconPanel.java
@@ -176,7 +176,7 @@ public void updateUI() {
 	/**
 	 * Listens for events in the text component we're annotating.
 	 */
-	private class ComponentListener implements FocusListener {
+	private final class ComponentListener implements FocusListener {
 
 		/**
 		 * Called when the combo box or text component gains focus.
diff --git a/RSTAUI/src/main/java/org/fife/rsta/ui/CollapsibleSectionPanel.java b/RSTAUI/src/main/java/org/fife/rsta/ui/CollapsibleSectionPanel.java
@@ -362,7 +362,7 @@ private void uiUpdated() {
 	/**
 	 * Hides the bottom component.
 	 */
-	private class HideBottomComponentAction extends AbstractAction {
+	private final class HideBottomComponentAction extends AbstractAction {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
diff --git a/RSTAUI/src/main/java/org/fife/rsta/ui/GoToDialog.java b/RSTAUI/src/main/java/org/fife/rsta/ui/GoToDialog.java
@@ -299,7 +299,7 @@ public void setVisible(boolean visible) {
 	/**
 	 * Listens for events in this dialog.
 	 */
-	private class Listener implements ActionListener, DocumentListener {
+	private final class Listener implements ActionListener, DocumentListener {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
@@ -332,7 +332,7 @@ public void removeUpdate(DocumentEvent e) {
 	/**
 	 * A document filter that only lets the user enter digits.
 	 */
-	private class NumberDocumentFilter extends DocumentFilter {
+	private final class NumberDocumentFilter extends DocumentFilter {
 
 		private String fix(String str) {
 			if (str!=null) {
diff --git a/RSTAUI/src/main/java/org/fife/rsta/ui/UIUtil.java b/RSTAUI/src/main/java/org/fife/rsta/ui/UIUtil.java
@@ -298,9 +298,8 @@ public static void makeSpringCompactGrid(Container parent, int rows,
 		try {
 			layout = (SpringLayout)parent.getLayout();
 		} catch (ClassCastException cce) {
-			System.err.println("The first argument to makeCompactGrid " +
-							"must use SpringLayout.");
-			return;
+			throw new IllegalArgumentException("The first argument to makeSpringCompactGrid " +
+							"must use SpringLayout.", cce);
 		}
 
 		//Align all cells in each column and make them the same width.
diff --git a/RSTAUI/src/main/java/org/fife/rsta/ui/search/AbstractSearchDialog.java b/RSTAUI/src/main/java/org/fife/rsta/ui/search/AbstractSearchDialog.java
@@ -651,7 +651,7 @@ public final void setWrapCheckboxText(String text) {
 	/**
 	 * Listens for properties changing in the search context.
 	 */
-	private class SearchContextListener implements PropertyChangeListener {
+	private final class SearchContextListener implements PropertyChangeListener {
 
 		@Override
 		public void propertyChange(PropertyChangeEvent e) {
diff --git a/RSTAUI/src/main/java/org/fife/rsta/ui/search/FindDialog.java b/RSTAUI/src/main/java/org/fife/rsta/ui/search/FindDialog.java
@@ -231,7 +231,7 @@ public void updateUI() {
 	/**
 	 * Listens for changes in the text field (find search field).
 	 */
-	private class FindDocumentListener implements DocumentListener {
+	private final class FindDocumentListener implements DocumentListener {
 
 		@Override
 		public void insertUpdate(DocumentEvent e) {
@@ -260,7 +260,7 @@ public void changedUpdate(DocumentEvent e) {
 	 * Listens for the text field gaining focus.  All it does is select all
 	 * text in the combo box's text area.
 	 */
-	private class FindFocusAdapter extends FocusAdapter {
+	private final class FindFocusAdapter extends FocusAdapter {
 
 		@Override
 		public void focusGained(FocusEvent e) {
diff --git a/RSTAUI/src/main/java/org/fife/rsta/ui/search/FindToolBar.java b/RSTAUI/src/main/java/org/fife/rsta/ui/search/FindToolBar.java
@@ -603,7 +603,7 @@ public void setSearchContext(SearchContext context) {
 	 * Listens for events in this toolbar.  Keeps the UI in sync with the
 	 * search context and vice versa.
 	 */
-	private class ToolBarListener extends MouseAdapter
+	private final class ToolBarListener extends MouseAdapter
 			implements ActionListener, PropertyChangeListener {
 
 		@Override
@@ -792,7 +792,7 @@ public void removeUpdate(DocumentEvent e) {
 	 * delay.  Fires a "mark all" search event for applications that want to
 	 * display "mark all" results on the fly.
 	 */
-	private class MarkAllEventNotifier implements ActionListener {
+	private final class MarkAllEventNotifier implements ActionListener {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
diff --git a/RSTAUI/src/main/java/org/fife/rsta/ui/search/RegexAwareComboBox.java b/RSTAUI/src/main/java/org/fife/rsta/ui/search/RegexAwareComboBox.java
@@ -262,7 +262,7 @@ public void setContentAssistImage(Image image) {
 	/**
 	 * A completion provider for regular expressions.
 	 */
-	private static class RegexAwareProvider extends DefaultCompletionProvider {
+	private static final class RegexAwareProvider extends DefaultCompletionProvider {
 
 		@Override
 		protected boolean isValidChar(char ch) {
diff --git a/RSTAUI/src/main/java/org/fife/rsta/ui/search/ReplaceDialog.java b/RSTAUI/src/main/java/org/fife/rsta/ui/search/ReplaceDialog.java
@@ -511,7 +511,7 @@ public void updateUI() {
 	/**
 	 * Listens for changes in the text field (find search field).
 	 */
-	private class ReplaceDocumentListener implements DocumentListener {
+	private final class ReplaceDocumentListener implements DocumentListener {
 
 		@Override
 		public void insertUpdate(DocumentEvent e) {
@@ -547,7 +547,7 @@ public void changedUpdate(DocumentEvent e) {
 	/**
 	 * Listens for the text fields gaining focus.
 	 */
-	private class ReplaceFocusAdapter extends FocusAdapter {
+	private final class ReplaceFocusAdapter extends FocusAdapter {
 
 		@Override
 		public void focusGained(FocusEvent e) {
diff --git a/RSTAUIDemo/build.gradle b/RSTAUIDemo/build.gradle
@@ -1,4 +1,10 @@
-archivesBaseName = 'rstauidemo'
+plugins {
+    id 'base'
+}
+
+base {
+    archivesName = 'rstauidemo'
+}
 
 dependencies {
     implementation project(':RSTAUI')
diff --git a/build.gradle b/build.gradle
@@ -1,22 +1,30 @@
 plugins {
-    id 'com.github.spotbugs' version '5.0.13'
+    id 'com.github.spotbugs' version '6.1.7'
 }
 
-group 'com.fifesoft'
-// NOTE: Local Java 8:  /Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home
+// We require building with JDK 17 or later. Built artifact compatibility
+// is controlled by javaLanguageVersion
+assert JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)
+
+group = 'com.fifesoft'
+// NOTE: Local Java 17: /Library/Java/JavaVirtualMachines/jdk-17.0.13+11/Contents/Home
 
 allprojects {
 
     repositories {
         mavenLocal()
         mavenCentral()
         maven {
-            url 'https://oss.sonatype.org/content/repositories/snapshots'
+            url = 'https://oss.sonatype.org/content/repositories/snapshots'
         }
     }
 
     wrapper {
-        gradleVersion = '7.6'
+        gradleVersion = '8.13'
+    }
+
+    tasks.withType(Javadoc) {
+        options.addStringOption('Xdoclint:none', '-quiet')
     }
 }
 
@@ -31,7 +39,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = '9.3'
+        toolVersion = '10.21.4'
     }
 
     spotbugs {
@@ -60,14 +68,8 @@ subprojects {
         }
     }
 
-    dependencies {
-        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
-        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
-    }
-
     compileJava {
-        sourceCompatibility javaVersion.toString()
-        targetCompatibility javaVersion.toString()
+        options.release = Integer.parseInt(javaLanguageVersion)
         options.debug = true
         options.debugOptions.debugLevel = 'source,vars,lines'
         options.compilerArgs << '-Xlint:deprecation' << '-Xlint:unchecked'
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -75,14 +75,20 @@
 	<!-- See https://checkstyle.sourceforge.io/config_whitespace.html -->
 	<!--<module name="FileTabCharacter"/>-->
 
-	<!-- Miscellaneous other checks.                            -->
-	<!-- See https://checkstyle.sourceforge.io/config_misc.html -->
+	<!-- Miscellaneous other checks.                                               -->
+	<!-- See https://checkstyle.sourceforge.io/checks/regexp/regexpsingleline.html -->
 	<module name="RegexpSingleline">
 		<property name="format" value="\s+$"/>
 		<property name="minimum" value="0"/>
 		<property name="maximum" value="0"/>
 		<property name="message" value="Line has trailing spaces."/>
 	</module>
+	<module name="RegexpSingleline">
+		<property name="format" value="(?&lt;!//)\s*System\.(?:out|err)\.println\("/>
+		<property name="minimum" value="0"/>
+		<property name="maximum" value="0"/>
+		<property name="message" value="Do not use System.out.println or System.err.println"/>
+	</module>
 
 	<!-- Checks for Headers                                         -->
 	<!-- See https://checkstyle.sourceforge.io/config_header.html   -->
@@ -99,7 +105,6 @@
 
 		<!-- Checks for Javadoc comments.                              -->
 		<!-- See https://checkstyle.sourceforge.io/config_javadoc.html -->
-		<!--<module name="JavadocMethod"/> This is just too whiny for now. -->
 		<module name="JavadocType"/>
 		<!--
         <module name="JavadocVariable">
@@ -177,8 +182,21 @@
 		</module>
 		<module name="ParenPad"/>
 		<module name="TypecastParenPad"/>
-		<!--<module name="WhitespaceAround"/>-->
-
+		<module name="WhitespaceAfter">
+			<!-- TODO: Add COMMA and possibly SEMI, but it'll be a big diff -->
+			<property name="tokens" value="LITERAL_IF, LITERAL_ELSE, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR,
+                 LITERAL_FINALLY, LITERAL_CATCH, DO_WHILE, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY,
+                 LITERAL_CASE, LAMBDA, LITERAL_WHEN"/>
+		</module>
+		<module name="WhitespaceAround">
+			<property name="allowEmptyConstructors" value="true"/>
+			<property name="allowEmptyMethods" value="true"/>
+			<property name="allowEmptyTypes" value="true"/>
+			<!-- Don't check around boolean comparators as old code didn't follow this convention for them. -->
+			<property name="tokens" value="LCURLY, LITERAL_IF, LITERAL_ELSE, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR,
+                 LITERAL_FINALLY, LITERAL_CATCH, DO_WHILE, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY,
+                 LAMBDA, LITERAL_WHEN"/>
+		</module>
 
 		<!-- Modifier Checks                                            -->
 		<!-- See https://checkstyle.sourceforge.io/config_modifier.html -->
@@ -203,6 +221,7 @@
 		<!-- See https://checkstyle.sourceforge.io/config_coding.html -->
 		<!--<module name="AvoidInlineConditionals"/>-->
 		<!--<module name="EmptyStatement"/> Removed to allow "while (doSomething());" -->
+		<module name="ConstructorsDeclarationGrouping"/>
 		<module name="EqualsAvoidNull"/>
 		<module name="EqualsHashCode"/>
 		<module name="ExplicitInitialization"/>
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
