Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GitHub actions #95

Merged
merged 1 commit into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up JDK 8
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'adopt'
java-version: '17'
distribution: 'temurin'

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

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
20 changes: 11 additions & 9 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,25 @@ jobs:

strategy:
matrix:
java: [ '8', '11', '14', '17']
java: [ '17', '21', '23' ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Verify gradle wrapper
uses: gradle/actions/wrapper-validation@v4
if: matrix.java == '17'

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'adopt'
distribution: 'temurin'

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

# Note: Assumes we're running on Ubuntu
# https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
- name: Build with Gradle
#run: ./gradlew build --warning-mode all
uses: GabrielBB/xvfb-action@v1
with:
run: ./gradlew build -xsign -xpublish --warning-mode all
working-directory: ./ #optional
run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ class AutoCompleteDescWindow extends JWindow implements HyperlinkListener,
* @param owner The parent window.
* @param ac The parent auto-completion.
*/
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
AutoCompleteDescWindow(Window owner, AutoCompletion ac) {

super(owner);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ public class AutoCompletion {
*
* @param provider The completion provider. This cannot be <code>null</code>
*/
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
public AutoCompletion(CompletionProvider provider) {

setChoicesWindowSize(350, 200);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ protected LanguageAwareCompletionProvider() {
* @param defaultProvider The provider to use when no provider is assigned
* to a particular token type. This cannot be <code>null</code>.
*/
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
public LanguageAwareCompletionProvider(CompletionProvider defaultProvider) {
setDefaultCompletionProvider(defaultProvider);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class OutlineHighlightPainter extends
*/
OutlineHighlightPainter(Color color) {
super(color);
setColor(color);
this.color = color != null? color : Color.BLACK; // SpotBugs
}


Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

plugins {
id 'com.github.spotbugs' version '5.2.5'
id 'com.github.spotbugs' version '6.0.26'
}

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