diff --git a/.github/workflows/github-actions-java8.yml b/.github/workflows/github-actions-java8.yml index 46abd2b..b497bfe 100644 --- a/.github/workflows/github-actions-java8.yml +++ b/.github/workflows/github-actions-java8.yml @@ -49,13 +49,14 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout repository code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set up JDK 8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: "8" distribution: "zulu" + check-latest: true # Get the latest Java 8 patch version - name: Validate Gradle wrapper uses: gradle/actions/wrapper-validation@v4 @@ -64,10 +65,25 @@ jobs: if: runner.os != 'Windows' run: chmod +x ./gradlew + - name: Run OWASP dependency check + if: matrix.os == 'windows-latest' # Only run on one platform + run: ./gradlew dependencyCheckAnalyze --no-daemon --stacktrace --continue + continue-on-error: true # Don't fail the build if dependency check has issues + env: + NVD_API_KEY: ${{ secrets.NVD_API_KEY }} + + - name: Upload dependency check report + uses: actions/upload-artifact@v7 + if: matrix.os == 'windows-latest' # Only upload from one platform + with: + name: dependency-check-report + path: build/reports/dependency-check-report.html + retention-days: 30 + - name: Build with Gradle run: ./gradlew buildShadow --no-daemon --stacktrace - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: matrix.os == 'windows-latest' # Only upload from one platform with: name: TestCheater-${{ github.sha }} @@ -75,7 +91,7 @@ jobs: retention-days: 30 - name: Upload build reports - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 if: failure() with: name: build-reports-${{ matrix.os }} diff --git a/build.gradle.kts b/build.gradle.kts index 033a85e..a48a67f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,10 +5,10 @@ import java.util.Date plugins { application - kotlin("jvm") version "2.2.0" - kotlin("kapt") version "2.2.0" + kotlin("jvm") version "2.4.0" + kotlin("kapt") version "2.4.0" id("com.gradleup.shadow") version "8.3.8" - id("org.owasp.dependencycheck") version "9.0.7" + id("org.owasp.dependencycheck") version "12.2.2" } project.ext { @@ -24,18 +24,18 @@ repositories { dependencies { implementation(kotlin("stdlib")) - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0") - implementation("org.slf4j:slf4j-log4j12:2.0.17") - implementation("org.apache.logging.log4j:log4j-core:2.25.1") - implementation("org.apache.logging.log4j:log4j-api:2.25.1") - implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.25.1") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.4.0") + implementation("org.slf4j:slf4j-log4j12:2.0.18") + implementation("org.apache.logging.log4j:log4j-core:2.26.0") + implementation("org.apache.logging.log4j:log4j-api:2.26.0") + implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.26.0") implementation("io.github.kolod:flatlaf-themes-combobox-model:1.1.1") - implementation("com.formdev:flatlaf:3.6.1") - implementation("com.formdev:flatlaf-extras:3.6.1") - implementation("com.formdev:flatlaf-intellij-themes:3.6.1") + implementation("com.formdev:flatlaf:3.7.1") + implementation("com.formdev:flatlaf-extras:3.7.1") + implementation("com.formdev:flatlaf-intellij-themes:3.7.1") implementation("org.drjekyll:fontchooser:3.1.0") - implementation("org.xerial:sqlite-jdbc:3.50.2.0") - implementation("com.jcabi:jcabi-manifests:2.1.0") + implementation("org.xerial:sqlite-jdbc:3.53.2.0") + implementation("com.jcabi:jcabi-manifests:2.2.0") } application { @@ -76,6 +76,10 @@ tasks.withType { from(configurations.runtimeClasspath.get().map {if (it.isDirectory) it else zipTree(it)}) } +dependencyCheck { + nvd.apiKey = System.getenv("NVD_API_KEY") ?: "" +} + tasks { build { dependsOn(shadowJar) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..404b8d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ +#Sun Jun 07 09:14:15 EEST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip -networkTimeout=10000 -validateDistributionUrl=true +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists