Preparing for 3.3.1 release

bobbylight · Jan 14, 2023 · 229ca1d · 229ca1d
1 parent 487d3d3
commit 229ca1d
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 26 deletions.
diff --git a/RSTAUI/build.gradle b/RSTAUI/build.gradle
@@ -9,8 +9,8 @@ assert JavaVersion.current().isJava8Compatible()
 archivesBaseName = 'rstaui'
 
 dependencies {
-    api 'com.fifesoft:rsyntaxtextarea:3.3.1'
-    api 'com.fifesoft:autocomplete:3.3.1-SNAPSHOT'
+    api 'com.fifesoft:rsyntaxtextarea:3.3.2'
+    api 'com.fifesoft:autocomplete:3.3.1'
 }
 
 ext.isReleaseVersion = !project.version.endsWith('SNAPSHOT')

diff --git a/RSTAUIDemo/src/main/java/org/fife/rsta/ui/demo/RSTAUIDemoApp.java b/RSTAUIDemo/src/main/java/org/fife/rsta/ui/demo/RSTAUIDemoApp.java
@@ -1,3 +1,7 @@
+/*
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTAUI.License.txt file for details.
+ */
 package org.fife.rsta.ui.demo;
 
 import java.awt.*;

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC
-	"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-	"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+	"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+	"https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
 
@@ -20,11 +20,12 @@
     - some best practices
 
   Checkstyle is very configurable. Be sure to read the documentation at
-  https://checkstyle.sourceforge.io/ (or in your downloaded distribution).
+  https://checkstyle.org (or in your downloaded distribution).
 
   Most Checks are configurable, be sure to consult the documentation.
 
   To completely disable a check, just comment it out or delete it from the file.
+  To suppress certain violations please review suppression filters.
 
   Finally, it is worth reading the documentation.
 
@@ -44,7 +45,7 @@
 
 	<!-- Part of turning off individual checks: -->
 	<!-- https://stackoverflow.com/questions/4023185/disable-a-particular-checkstyle-rule-for-a-particular-line-of-code -->
-	<module name="SuppressWarningsFilter" />
+	<module name="SuppressWarningsFilter"/>
 
 	<!-- Checks that a package-info.java file exists for each package.            -->
 	<!-- See https://checkstyle.sourceforge.io/config_javadoc.html#JavadocPackage -->
@@ -63,7 +64,7 @@
 	<!-- Checks for Size Violations.                             -->
 	<!-- See https://checkstyle.sourceforge.io/config_sizes.html -->
 	<module name="FileLength">
-		<property name="max" value="1600"/>
+		<property name="max" value="850"/>
 	</module>
 
 	<module name="LineLength">
@@ -83,18 +84,18 @@
 		<property name="message" value="Line has trailing spaces."/>
 	</module>
 
-	<!-- Checks for Headers                                -->
-	<!-- See http://checkstyle.sf.net/config_header.html   -->
-	<!-- <module name="Header"> -->
-	<!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
-	<!--   <property name="fileExtensions" value="java"/> -->
-	<!-- </module> -->
+	<!-- Checks for Headers                                         -->
+	<!-- See https://checkstyle.sourceforge.io/config_header.html   -->
+	<module name="Header">
+		<property name="headerFile" value="${config_loc}/javaHeader.txt"/>
+		<property name="fileExtensions" value="java"/>
+	</module>
 
 	<module name="TreeWalker">
 
 		<!-- Part of turning off individual checks: -->
 		<!-- https://stackoverflow.com/questions/5761188/checkstyle-suppressioncommentfilter-not-ignoring-specified-rule/5764666#5764666 -->
-		<module name="SuppressWarningsHolder" />
+		<module name="SuppressWarningsHolder"/>
 
 		<!-- Checks for Javadoc comments.                              -->
 		<!-- See https://checkstyle.sourceforge.io/config_javadoc.html -->
@@ -145,21 +146,21 @@
 		<module name="MissingDeprecated"/>
 		<module name="MissingOverride"/>
 
-		<!-- Checks for imports                              -->
+		<!-- Checks for imports                                        -->
 		<!-- See https://checkstyle.sourceforge.io/config_imports.html -->
 		<!--<module name="AvoidStarImport"/>-->
 		<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
 		<module name="RedundantImport"/>
 		<module name="UnusedImports"/>
 
 
-		<!-- Checks for Size Violations.                               -->
-		<!-- See https://checkstyle.sourceforge.io/config_imports.html -->
+		<!-- Checks for Size Violations.                             -->
+		<!-- See https://checkstyle.sourceforge.io/config_sizes.html -->
 		<module name="MethodLength">
 			<property name="max" value="300"/>
 		</module>
 		<module name="ParameterNumber">
-			<property name="max" value="9"/>
+			<property name="max" value="7"/>
 			<!--<property name="ignoreOverriddenMethods" value="true"/>-->
 		</module>
 
@@ -211,19 +212,19 @@
 			<property name="ignoreConstructorParameter" value="true" />
 		</module>
 		-->
-<!--		<module name="IllegalCatch"/>-->
+		<!--		<module name="IllegalCatch"/>-->
 		<module name="IllegalInstantiation"/>
 		<module name="IllegalThrows"/>
 		<module name="IllegalType"/>
-        <!--<module name="InnerAssignment"/> -->
-        <!--<module name="MagicNumber"/> Unfortunately, too much noise -->
-        <!--<module name="MissingSwitchDefault"/>-->
+		<!--<module name="InnerAssignment"/> -->
+		<!--<module name="MagicNumber"/> Unfortunately, too much noise -->
+		<!--<module name="MissingSwitchDefault"/>-->
 		<module name="MultipleVariableDeclarations"/>
 		<module name="SimplifyBooleanExpression"/>
 		<module name="SimplifyBooleanReturn"/>
 		<!--		<module name="UnnecessaryParentheses"/>-->
-		<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
 		<module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
+		<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
 		<module name="UnnecessarySemicolonInEnumeration"/>
 		<module name="UnnecessarySemicolonInTryWithResources"/>
 		<module name="UnusedLocalVariable"/>
@@ -251,7 +252,9 @@
 
 		<!-- Checks for metrics.                                       -->
 		<!-- See https://checkstyle.sourceforge.io/config_metrics.html -->
-		<!--        <module name="CyclomaticComplexity"/>-->
+		<module name="CyclomaticComplexity">
+			<property name="switchBlockAsSingleDecisionPoint" value="true"/>
+		</module>
 	</module>
 
 	<module name="Translation">

diff --git a/config/checkstyle/javaHeader.txt b/config/checkstyle/javaHeader.txt
@@ -0,0 +1 @@
+/*
diff --git a/config/checkstyle/rstauiSuppressions.xml b/config/checkstyle/rstauiSuppressions.xml
@@ -5,4 +5,5 @@
 	"https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <suppressions>
     <suppress files=".*src[\\/]test[\\/].*" checks="[a-zA-Z0-9]*"/>
+	<suppress files="package-info.java" checks="Header"/>
 </suppressions>
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Note that Maven- and signing-related properties are in <maven-home>/gradle.properties
 javaVersion=1.8
-version=3.3.1-SNAPSHOT
+version=3.3.1
 
 # Ugh, see https://github.com/gradle/gradle/issues/11308
 systemProp.org.gradle.internal.publish.checksums.insecure=true