Skip to content

Commit 229ca1d

Browse files
committed
Preparing for 3.3.1 release
1 parent 487d3d3 commit 229ca1d

6 files changed

Lines changed: 35 additions & 26 deletions

File tree

RSTAUI/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ assert JavaVersion.current().isJava8Compatible()
99
archivesBaseName = 'rstaui'
1010

1111
dependencies {
12-
api 'com.fifesoft:rsyntaxtextarea:3.3.1'
13-
api 'com.fifesoft:autocomplete:3.3.1-SNAPSHOT'
12+
api 'com.fifesoft:rsyntaxtextarea:3.3.2'
13+
api 'com.fifesoft:autocomplete:3.3.1'
1414
}
1515

1616
ext.isReleaseVersion = !project.version.endsWith('SNAPSHOT')

RSTAUIDemo/src/main/java/org/fife/rsta/ui/demo/RSTAUIDemoApp.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* This library is distributed under a modified BSD license. See the included
3+
* RSTAUI.License.txt file for details.
4+
*/
15
package org.fife.rsta.ui.demo;
26

37
import java.awt.*;

config/checkstyle/checkstyle.xml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE module PUBLIC
3-
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
4-
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
3+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
55

66
<!--
77
@@ -20,11 +20,12 @@
2020
- some best practices
2121
2222
Checkstyle is very configurable. Be sure to read the documentation at
23-
https://checkstyle.sourceforge.io/ (or in your downloaded distribution).
23+
https://checkstyle.org (or in your downloaded distribution).
2424
2525
Most Checks are configurable, be sure to consult the documentation.
2626
2727
To completely disable a check, just comment it out or delete it from the file.
28+
To suppress certain violations please review suppression filters.
2829
2930
Finally, it is worth reading the documentation.
3031
@@ -44,7 +45,7 @@
4445

4546
<!-- Part of turning off individual checks: -->
4647
<!-- https://stackoverflow.com/questions/4023185/disable-a-particular-checkstyle-rule-for-a-particular-line-of-code -->
47-
<module name="SuppressWarningsFilter" />
48+
<module name="SuppressWarningsFilter"/>
4849

4950
<!-- Checks that a package-info.java file exists for each package. -->
5051
<!-- See https://checkstyle.sourceforge.io/config_javadoc.html#JavadocPackage -->
@@ -63,7 +64,7 @@
6364
<!-- Checks for Size Violations. -->
6465
<!-- See https://checkstyle.sourceforge.io/config_sizes.html -->
6566
<module name="FileLength">
66-
<property name="max" value="1600"/>
67+
<property name="max" value="850"/>
6768
</module>
6869

6970
<module name="LineLength">
@@ -83,18 +84,18 @@
8384
<property name="message" value="Line has trailing spaces."/>
8485
</module>
8586

86-
<!-- Checks for Headers -->
87-
<!-- See http://checkstyle.sf.net/config_header.html -->
88-
<!-- <module name="Header"> -->
89-
<!-- <property name="headerFile" value="${checkstyle.header.file}"/> -->
90-
<!-- <property name="fileExtensions" value="java"/> -->
91-
<!-- </module> -->
87+
<!-- Checks for Headers -->
88+
<!-- See https://checkstyle.sourceforge.io/config_header.html -->
89+
<module name="Header">
90+
<property name="headerFile" value="${config_loc}/javaHeader.txt"/>
91+
<property name="fileExtensions" value="java"/>
92+
</module>
9293

9394
<module name="TreeWalker">
9495

9596
<!-- Part of turning off individual checks: -->
9697
<!-- https://stackoverflow.com/questions/5761188/checkstyle-suppressioncommentfilter-not-ignoring-specified-rule/5764666#5764666 -->
97-
<module name="SuppressWarningsHolder" />
98+
<module name="SuppressWarningsHolder"/>
9899

99100
<!-- Checks for Javadoc comments. -->
100101
<!-- See https://checkstyle.sourceforge.io/config_javadoc.html -->
@@ -145,21 +146,21 @@
145146
<module name="MissingDeprecated"/>
146147
<module name="MissingOverride"/>
147148

148-
<!-- Checks for imports -->
149+
<!-- Checks for imports -->
149150
<!-- See https://checkstyle.sourceforge.io/config_imports.html -->
150151
<!--<module name="AvoidStarImport"/>-->
151152
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
152153
<module name="RedundantImport"/>
153154
<module name="UnusedImports"/>
154155

155156

156-
<!-- Checks for Size Violations. -->
157-
<!-- See https://checkstyle.sourceforge.io/config_imports.html -->
157+
<!-- Checks for Size Violations. -->
158+
<!-- See https://checkstyle.sourceforge.io/config_sizes.html -->
158159
<module name="MethodLength">
159160
<property name="max" value="300"/>
160161
</module>
161162
<module name="ParameterNumber">
162-
<property name="max" value="9"/>
163+
<property name="max" value="7"/>
163164
<!--<property name="ignoreOverriddenMethods" value="true"/>-->
164165
</module>
165166

@@ -211,19 +212,19 @@
211212
<property name="ignoreConstructorParameter" value="true" />
212213
</module>
213214
-->
214-
<!-- <module name="IllegalCatch"/>-->
215+
<!-- <module name="IllegalCatch"/>-->
215216
<module name="IllegalInstantiation"/>
216217
<module name="IllegalThrows"/>
217218
<module name="IllegalType"/>
218-
<!--<module name="InnerAssignment"/> -->
219-
<!--<module name="MagicNumber"/> Unfortunately, too much noise -->
220-
<!--<module name="MissingSwitchDefault"/>-->
219+
<!--<module name="InnerAssignment"/> -->
220+
<!--<module name="MagicNumber"/> Unfortunately, too much noise -->
221+
<!--<module name="MissingSwitchDefault"/>-->
221222
<module name="MultipleVariableDeclarations"/>
222223
<module name="SimplifyBooleanExpression"/>
223224
<module name="SimplifyBooleanReturn"/>
224225
<!-- <module name="UnnecessaryParentheses"/>-->
225-
<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
226226
<module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
227+
<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
227228
<module name="UnnecessarySemicolonInEnumeration"/>
228229
<module name="UnnecessarySemicolonInTryWithResources"/>
229230
<module name="UnusedLocalVariable"/>
@@ -251,7 +252,9 @@
251252

252253
<!-- Checks for metrics. -->
253254
<!-- See https://checkstyle.sourceforge.io/config_metrics.html -->
254-
<!-- <module name="CyclomaticComplexity"/>-->
255+
<module name="CyclomaticComplexity">
256+
<property name="switchBlockAsSingleDecisionPoint" value="true"/>
257+
</module>
255258
</module>
256259

257260
<module name="Translation">

config/checkstyle/javaHeader.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/*

config/checkstyle/rstauiSuppressions.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
"https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
66
<suppressions>
77
<suppress files=".*src[\\/]test[\\/].*" checks="[a-zA-Z0-9]*"/>
8+
<suppress files="package-info.java" checks="Header"/>
89
</suppressions>

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Note that Maven- and signing-related properties are in <maven-home>/gradle.properties
22
javaVersion=1.8
3-
version=3.3.1-SNAPSHOT
3+
version=3.3.1
44

55
# Ugh, see https://github.com/gradle/gradle/issues/11308
66
systemProp.org.gradle.internal.publish.checksums.insecure=true

0 commit comments

Comments
 (0)