Skip to content

Commit 6cf509f

Browse files
committed
Fix GitHub actions
1 parent 0f48d73 commit 6cf509f

File tree

7 files changed

+26
-23
lines changed

7 files changed

+26
-23
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ jobs:
3535

3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@v2
38+
uses: actions/checkout@v4
3939

40-
- name: Set up JDK 8
41-
uses: actions/setup-java@v2
40+
- name: Set up JDK 17
41+
uses: actions/setup-java@v4
4242
with:
43-
java-version: '8'
44-
distribution: 'adopt'
43+
java-version: '17'
44+
distribution: 'temurin'
4545

4646
# Initializes the CodeQL tools for scanning.
4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@v1
48+
uses: github/codeql-action/init@v3
4949
with:
5050
languages: ${{ matrix.language }}
5151
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,12 +65,10 @@ jobs:
6565
# and modify them (or add more) to build your code if your project
6666
# uses a compiled language
6767

68+
# Note: Assumes we're running on Ubuntu
69+
# https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
6870
- name: Build
69-
#run: ./gradlew build --warning-mode all
70-
uses: GabrielBB/xvfb-action@v1
71-
with:
72-
run: ./gradlew build -xsign -xpublish --warning-mode all
73-
working-directory: ./ #optional
71+
run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all
7472

7573
- name: Perform CodeQL Analysis
76-
uses: github/codeql-action/analyze@v1
74+
uses: github/codeql-action/analyze@v3

.github/workflows/gradle.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,25 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
java: [ '8', '11', '14', '17']
19+
java: [ '17', '21', '23' ]
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
23+
24+
- name: Verify gradle wrapper
25+
uses: gradle/actions/wrapper-validation@v4
26+
if: matrix.java == '17'
2327

2428
- name: Set up JDK ${{ matrix.java }}
25-
uses: actions/setup-java@v2
29+
uses: actions/setup-java@v4
2630
with:
2731
java-version: ${{ matrix.java }}
28-
distribution: 'adopt'
32+
distribution: 'temurin'
2933

3034
- name: Grant execute permission for gradlew
3135
run: chmod +x gradlew
3236

37+
# Note: Assumes we're running on Ubuntu
38+
# https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
3339
- name: Build with Gradle
34-
#run: ./gradlew build --warning-mode all
35-
uses: GabrielBB/xvfb-action@v1
36-
with:
37-
run: ./gradlew build -xsign -xpublish --warning-mode all
38-
working-directory: ./ #optional
40+
run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all

AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ class AutoCompleteDescWindow extends JWindow implements HyperlinkListener,
132132
* @param owner The parent window.
133133
* @param ac The parent auto-completion.
134134
*/
135+
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
135136
AutoCompleteDescWindow(Window owner, AutoCompletion ac) {
136137

137138
super(owner);

AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompletion.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ public class AutoCompletion {
259259
*
260260
* @param provider The completion provider. This cannot be <code>null</code>
261261
*/
262+
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
262263
public AutoCompletion(CompletionProvider provider) {
263264

264265
setChoicesWindowSize(350, 200);

AutoComplete/src/main/java/org/fife/ui/autocomplete/LanguageAwareCompletionProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ protected LanguageAwareCompletionProvider() {
9090
* @param defaultProvider The provider to use when no provider is assigned
9191
* to a particular token type. This cannot be <code>null</code>.
9292
*/
93+
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
9394
public LanguageAwareCompletionProvider(CompletionProvider defaultProvider) {
9495
setDefaultCompletionProvider(defaultProvider);
9596
}

AutoComplete/src/main/java/org/fife/ui/autocomplete/OutlineHighlightPainter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class OutlineHighlightPainter extends
5353
*/
5454
OutlineHighlightPainter(Color color) {
5555
super(color);
56-
setColor(color);
56+
this.color = color != null? color : Color.BLACK; // SpotBugs
5757
}
5858

5959

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
plugins {
11-
id 'com.github.spotbugs' version '5.2.5'
11+
id 'com.github.spotbugs' version '6.0.26'
1212
}
1313

1414
// We require building with JDK 17 or later. Built artifact compatibility

0 commit comments

Comments
 (0)