diff --git a/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java b/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java
index 13ae635..71f6675 100644
--- a/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java
+++ b/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java
@@ -228,8 +228,8 @@ private void clearHistory() {
 	 * Makes the current history page the last one in the history.
 	 */
 	private void clearHistoryAfterCurrentPos() {
-		for (int i=history.size()-1; i>historyPos; i--) {
-			history.remove(i);
+		if (history.size() > historyPos + 1) {
+			history.subList(historyPos + 1, history.size()).clear();
 		}
 		setActionStates();
 	}
diff --git a/AutoComplete/src/main/java/org/fife/ui/autocomplete/DefaultCompletionProvider.java b/AutoComplete/src/main/java/org/fife/ui/autocomplete/DefaultCompletionProvider.java
index ee4a1c9..58fbd2e 100644
--- a/AutoComplete/src/main/java/org/fife/ui/autocomplete/DefaultCompletionProvider.java
+++ b/AutoComplete/src/main/java/org/fife/ui/autocomplete/DefaultCompletionProvider.java
@@ -340,7 +340,7 @@ public void loadFromXML(InputStream in, ClassLoader cl) throws IOException {
 				char endChar = handler.getParamEndChar();
 				String sep = handler.getParamSeparator();
 				// Sanity check.  Note endChar can be null
-				if (sep != null && sep.length() > 0) {
+				if (sep != null && !sep.isEmpty()) {
 					setParameterizedCompletionParams(startChar, sep, endChar);
 				}
 			}
diff --git a/AutoComplete/src/main/java/org/fife/ui/autocomplete/ParameterizedCompletionChoicesWindow.java b/AutoComplete/src/main/java/org/fife/ui/autocomplete/ParameterizedCompletionChoicesWindow.java
index bc07350..e18be25 100644
--- a/AutoComplete/src/main/java/org/fife/ui/autocomplete/ParameterizedCompletionChoicesWindow.java
+++ b/AutoComplete/src/main/java/org/fife/ui/autocomplete/ParameterizedCompletionChoicesWindow.java
@@ -289,7 +289,7 @@ else if (visibleRowCount>0) {
 	public void setVisible(boolean visible) {
 		if (visible!=isVisible()) {
 			// i.e. if no possibilities matched what's been typed
-			if (visible && model.size()==0) {//list.getVisibleRowCount()==0) {
+			if (visible && model.isEmpty()) {//list.getVisibleRowCount()==0) {
 				return;
 			}
 			super.setVisible(visible);
diff --git a/AutoComplete/src/test/java/org/fife/ui/autocomplete/AbstractCompletionProviderTest.java b/AutoComplete/src/test/java/org/fife/ui/autocomplete/AbstractCompletionProviderTest.java
index 770308e..e5c14df 100644
--- a/AutoComplete/src/test/java/org/fife/ui/autocomplete/AbstractCompletionProviderTest.java
+++ b/AutoComplete/src/test/java/org/fife/ui/autocomplete/AbstractCompletionProviderTest.java
@@ -14,7 +14,7 @@
 class AbstractCompletionProviderTest {
 
 	/**
-	 * Regression test for https://github.com/bobbylight/AutoComplete/issues/101 -
+	 * Regression test for <a href="https://github.com/bobbylight/AutoComplete/issues/101">#101</a> -
 	 * when several completions share the same input text (e.g. overloaded
 	 * methods), the first one in the sorted completion list was never
 	 * included in the returned results, due to an off-by-one error.
diff --git a/build.gradle b/build.gradle
index 1379d9c..6860341 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.github.spotbugs' version '6.5.9'
+    id 'com.github.spotbugs' version '6.5.10'
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
 
@@ -31,7 +31,7 @@ allprojects {
     }
 
     wrapper {
-        gradleVersion = '9.6.1'
+        gradleVersion = '9.7.0'
     }
 }
 
@@ -50,7 +50,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = '13.8.0'
+        toolVersion = '13.11.0'
         configDirectory = file("$rootProject.projectDir/config/checkstyle")
     }
 
@@ -81,7 +81,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation platform('org.junit:junit-bom:6.0.1')
+        testImplementation platform('org.junit:junit-bom:6.1.3')
         testImplementation 'org.junit.jupiter:junit-jupiter'
         testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     }
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 503627a..effc446 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -112,7 +112,6 @@
             <property name="accessModifiers" value="package"/>
         </module>
         -->
-        <module name="JavadocStyle"/>
         <module name="AtclauseOrder"/>
         <module name="InvalidJavadocPosition"/>
         <module name="JavadocBlockTagLocation"/>
@@ -124,6 +123,7 @@
         <module name="JavadocTagContinuationIndentation"/>
         <module name="NonEmptyAtclauseDescription"/>
         <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+        <module name="SummaryJavadoc"/>
         <module name="MissingJavadocMethod">
             <property name="allowMissingPropertyJavadoc" value="true"/>
             <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/>
@@ -173,6 +173,7 @@
 
         <!-- Checks for whitespace                                              -->
         <!-- See https://checkstyle.sourceforge.io/checks/whitespace/index.html -->
+        <module name="ArrayBracketNoWhitespace"/>
         <module name="EmptyForIteratorPad"/>
         <module name="GenericWhitespace"/>
         <module name="MethodParamPad"/>
@@ -254,6 +255,7 @@
         <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
         <module name="UnnecessarySemicolonInEnumeration"/>
         <module name="UnnecessarySemicolonInTryWithResources"/>
+        <module name="UnnecessaryTypeArgumentsWithRecordPattern"/>
         <module name="UnusedLocalVariable"/>
         <module name="UnusedTryResourceShouldBeUnnamed"/>
         <!--<module name="UseEnhancedSwitch"/> - TODO: too noisy for now -->
@@ -276,6 +278,7 @@
         <module name="AvoidEscapedUnicodeCharacters"/>
         <module name="CommentsIndentation"/>
         <!--<module name="FinalParameters"/>-->
+        <module name="MultilineCommentLeadingAsteriskPresence"/>
         <module name="NumericalPrefixesInfixesSuffixesCharacterCase"/>
         <!-- <module name="TodoComment"/> -->
         <module name="UpperEll"/>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b1b8ef5..eddabd2 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a9db115..69dd0d0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500