Preparing for 3.1.3 release

Author: bobbylight

SpellChecker/build.gradle

@@ -9,8 +9,9 @@ assert JavaVersion.current().isJava8Compatible()
 archivesBaseName = 'spellchecker'
 
 dependencies {
-    api 'com.fifesoft:rsyntaxtextarea:3.1.3'
-    testImplementation 'junit:junit:4.13.2'
+    api 'com.fifesoft:rsyntaxtextarea:3.1.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 
 ext.isReleaseVersion = !project.version.endsWith('SNAPSHOT')

SpellChecker/src/test/java/org/fife/com/swabunga/spell/event/SpellCheckerTest.java

@@ -1,63 +1,66 @@
 package org.fife.com.swabunga.spell.event;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 /**
  * Unit tests for the {@code SpellChecker} class.
  */
-public class SpellCheckerTest {
+class SpellCheckerTest {
 
     @Test
-    public void testSplitMixedCaseWord_happyPath_notCamelCaseWord() {
+    void testSplitMixedCaseWord_happyPath_notCamelCaseWord() {
 
         List<String> actual = SpellChecker.splitMixedCaseWord("archer");
-        Assert.assertEquals(1, actual.size());
-        Assert.assertEquals("archer", actual.get(0));
+        Assertions.assertEquals(1, actual.size());
+        Assertions.assertEquals("archer", actual.get(0));
     }
 
     @Test
-    public void testSplitMixedCaseWord_happyPath_allValidWords() {
+    void testSplitMixedCaseWord_happyPath_allValidWords() {
 
         List<String> actual = SpellChecker.splitMixedCaseWord("camelCaseWord");
-        Assert.assertEquals(3, actual.size());
-        Assert.assertEquals("camel", actual.get(0));
-        Assert.assertEquals("Case", actual.get(1));
-        Assert.assertEquals("Word", actual.get(2));
+        Assertions.assertEquals(3, actual.size());
+        Assertions.assertEquals("camel", actual.get(0));
+        Assertions.assertEquals("Case", actual.get(1));
+        Assertions.assertEquals("Word", actual.get(2));
     }
 
     @Test
-    public void testSplitMixedCaseWord_happyPath_oneWordWithAllCaps() {
+    void testSplitMixedCaseWord_happyPath_oneWordWithAllCaps() {
 
         List<String> actual = SpellChecker.splitMixedCaseWord("HTMLValidator");
-        Assert.assertEquals("Unexpected split word count, actual = " + String.join(", ", actual), 2, actual.size());
-        Assert.assertEquals("HTML", actual.get(0));
-        Assert.assertEquals("Validator", actual.get(1));
+        Assertions.assertEquals(2, actual.size(),
+                "Unexpected split word count, actual = " + String.join(", ", actual));
+        Assertions.assertEquals("HTML", actual.get(0));
+        Assertions.assertEquals("Validator", actual.get(1));
     }
 
     @Test
-    public void testSplitMixedCaseWord_happyPath_multipleWordsWithAllCaps() {
+    void testSplitMixedCaseWord_happyPath_multipleWordsWithAllCaps() {
 
         List<String> actual = SpellChecker.splitMixedCaseWord("HTMLToXMLValidator");
-        Assert.assertEquals("Unexpected split word count, actual = " + String.join(", ", actual), 4, actual.size());
-        Assert.assertEquals("HTML", actual.get(0));
-        Assert.assertEquals("To", actual.get(1));
-        Assert.assertEquals("XML", actual.get(2));
-        Assert.assertEquals("Validator", actual.get(3));
+        Assertions.assertEquals(4, actual.size(),
+                "Unexpected split word count, actual = " + String.join(", ", actual));
+        Assertions.assertEquals("HTML", actual.get(0));
+        Assertions.assertEquals("To", actual.get(1));
+        Assertions.assertEquals("XML", actual.get(2));
+        Assertions.assertEquals("Validator", actual.get(3));
     }
 
     @Test
-    public void testSplitMixedCaseWord_happyPath_multipleWordsWithAllCaps2() {
+    void testSplitMixedCaseWord_happyPath_multipleWordsWithAllCaps2() {
 
         List<String> actual = SpellChecker.splitMixedCaseWord("weDONTWantTODoTHIS");
-        Assert.assertEquals("Unexpected split word count, actual = " + String.join(", ", actual), 6, actual.size());
-        Assert.assertEquals("we", actual.get(0));
-        Assert.assertEquals("DONT", actual.get(1));
-        Assert.assertEquals("Want", actual.get(2));
-        Assert.assertEquals("TO", actual.get(3));
-        Assert.assertEquals("Do", actual.get(4));
-        Assert.assertEquals("THIS", actual.get(5));
+        Assertions.assertEquals(6, actual.size(),
+                "Unexpected split word count, actual = " + String.join(", ", actual));
+        Assertions.assertEquals("we", actual.get(0));
+        Assertions.assertEquals("DONT", actual.get(1));
+        Assertions.assertEquals("Want", actual.get(2));
+        Assertions.assertEquals("TO", actual.get(3));
+        Assertions.assertEquals("Do", actual.get(4));
+        Assertions.assertEquals("THIS", actual.get(5));
     }
 }

build.gradle

@@ -16,7 +16,7 @@ allprojects {
     }
 
     wrapper {
-        gradleVersion = '7.0.2'
+        gradleVersion = '7.3.1'
     }
 
     tasks.withType(Javadoc) {
@@ -31,7 +31,7 @@ subprojects {
 //    apply plugin: 'com.github.spotbugs'
 
 //    checkstyle {
-//        toolVersion = '8.43'
+//        toolVersion = '9.2'
 //        configDirectory = file("$rootProject.projectDir/config/checkstyle")
 //    }
 

gradle.properties

@@ -1,6 +1,6 @@
 # Note that Maven- and signing-related properties are in <maven-home>/gradle.properties
 javaVersion=1.8
-version=3.1.3-SNAPSHOT
+version=3.1.3
 
 # Ugh, see https://github.com/gradle/gradle/issues/11308
 systemProp.org.gradle.internal.publish.checksums.insecure=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists