Skip to content
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
14 changes: 13 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ on:
branches:
- master

env:
JAVA_VERSION: '17.0.8+7'
JAVA_DISTRIBUTION: 'temurin'

jobs:
analyze:
name: Analyze
Expand All @@ -30,11 +34,19 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'java' ]
language: [ 'java-kotlin' ]

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
cache: gradle
- name: Verify Gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
Expand Down
39 changes: 20 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@
*/
plugins {
id 'application'
id 'org.openjfx.javafxplugin' version '0.0.13'
id 'com.github.ben-manes.versions' version '0.46.0'
id 'org.beryx.jlink' version '2.26.0'
id 'org.openjfx.javafxplugin' version '0.1.0'
id 'org.javamodularity.moduleplugin' version '1.8.12'
id 'com.github.ben-manes.versions' version '0.49.0'
id 'org.beryx.jlink' version '3.0.1'
id 'jacoco'
id 'net.ltgt.errorprone' version '3.0.1'
id 'org.sonarqube' version '4.0.0.2929'
id 'net.ltgt.errorprone' version '3.1.0'
id 'org.sonarqube' version '4.4.1.3373'
id 'org.ysb33r.cloudci' version '4.0.0'
id 'com.github.hierynomus.license' version '0.16.1'
id 'io.miret.etienne.sass' version '1.4.2'
id 'io.miret.etienne.sass' version '1.5.0'
}

group 'com.github.mfl28'
Expand All @@ -38,15 +39,15 @@ repositories {

dependencies {
// Junit (Unit testing)
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'

// TestFx UI TesTing // https://mvnrepository.com/artifact/org.testfx/testfx-junit5
testImplementation('org.testfx:testfx-junit5:4.0.17') {
exclude group: 'org.hamcrest'
}

// https://mvnrepository.com/artifact/nl.jqno.equalsverifier/equalsverifier
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.14.1'
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.15.2'

// Hamcrest https://mvnrepository.com/artifact/org.hamcrest/hamcrest
testImplementation 'org.hamcrest:hamcrest:2.2'
Expand All @@ -55,45 +56,45 @@ dependencies {
testImplementation 'org.mockito:mockito-inline:5.2.0'

// Mockito-Junit https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
testImplementation 'org.mockito:mockito-junit-jupiter:5.2.0'
testImplementation 'org.mockito:mockito-junit-jupiter:5.6.0'

// Commons Collections https://mvnrepository.com/artifact/org.apache.commons/commons-collections4
implementation 'org.apache.commons:commons-collections4:4.4'

// Commons Lang https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
implementation 'org.apache.commons:commons-lang3:3.12.0'
implementation 'org.apache.commons:commons-lang3:3.13.0'

// ControlsFX https://mvnrepository.com/artifact/org.controlsfx/controlsfx
implementation('org.controlsfx:controlsfx:11.1.2') {
exclude group: 'org.openjfx'
}

// Caffeine https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.5'
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'

// Gradle plugin to use the error-prone compiler https://github.com/tbroyer/gradle-errorprone-plugin
errorprone 'com.google.errorprone:error_prone_core:2.18.0'
errorprone 'com.google.errorprone:error_prone_core:2.23.0'

// Google GSON https://github.com/google/gson
implementation 'com.google.code.gson:gson:2.10.1'

// Jersey REST client https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-client
implementation 'org.glassfish.jersey.core:jersey-client:3.1.1'
implementation 'org.glassfish.jersey.core:jersey-client:3.1.3'

// HK2 InjectionManager https://mvnrepository.com/artifact/org.glassfish.jersey.inject/jersey-hk2
implementation 'org.glassfish.jersey.inject:jersey-hk2:3.1.1'
implementation 'org.glassfish.jersey.inject:jersey-hk2:3.1.3'

// Jersey Multipart https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-multipart
implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.1.1'
implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.1.3'

// Jaxb runtime https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime
implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.2'
implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.4'

// Mimepull https://mvnrepository.com/artifact/org.jvnet.mimepull/mimepull
implementation 'org.jvnet.mimepull:mimepull:1.10.0'

// Xml bind https://mvnrepository.com/artifact/jakarta.xml.bind/jakarta.xml.bind-api
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'

// https://mvnrepository.com/artifact/jakarta.ws.rs/jakarta.ws.rs-api
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
Expand All @@ -107,7 +108,7 @@ dependencies {

javafx {
version = '21.0.1'
modules = ['javafx.controls', 'javafx.swing']
modules = ['javafx.base', 'javafx.graphics', 'javafx.controls', 'javafx.swing']
}

test {
Expand Down Expand Up @@ -189,7 +190,7 @@ application {
}

java {
modularity.inferModulePath = true
modularity.inferModulePath = false
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 14 additions & 4 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

181 changes: 92 additions & 89 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.