From 9271f2538f7b334ca23fc15b7dd5100ef5c11129 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 15:31:26 +0000 Subject: [PATCH] Update all dependencies --- .github/workflows/build.yml | 16 ++++++++-------- auto-handbrake-cfr/build.gradle.kts | 4 ++-- base.Dockerfile | 2 +- build.gradle.kts | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d97c72..493e91c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Java 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: corretto java-version: 21 @@ -32,7 +32,7 @@ jobs: run: ./gradlew projects clean build --no-daemon --refresh-dependencies - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.1.4 + uses: codecov/codecov-action@v4.3.1 with: flags: unit-tests-${{ matrix.os }} fail_ci_if_error: true @@ -47,7 +47,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Java 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: corretto java-version: 21 @@ -77,14 +77,14 @@ jobs: - name: Integration Test # use retry cause the integration tests can be flaky. E.g. HandBrake crashing on the agent. - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: timeout_minutes: 10 max_attempts: 10 command: ./gradlew projects clean integrationTest --no-daemon --refresh-dependencies - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.1.4 + uses: codecov/codecov-action@v4.3.1 with: flags: integration-tests-${{ matrix.os }} fail_ci_if_error: true @@ -100,14 +100,14 @@ jobs: fetch-depth: 0 - name: Setup Java 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: corretto java-version: 21 - name: Bump version id: version - uses: paulhatch/semantic-version@v5.3.0 + uses: paulhatch/semantic-version@v5.4.0 - name: Build base image run: docker build -t handbrake-java-base -f base.Dockerfile . @@ -123,7 +123,7 @@ jobs: run: ./gradlew jib -Djib.to.tags=${{ steps.version.outputs.version }} - name: Create GitHub tag and release - uses: softprops/action-gh-release@v0.1.15 + uses: softprops/action-gh-release@v2.0.4 with: tag_name: ${{ steps.version.outputs.version_tag }} generate_release_notes: true \ No newline at end of file diff --git a/auto-handbrake-cfr/build.gradle.kts b/auto-handbrake-cfr/build.gradle.kts index f968ac0..86a9557 100644 --- a/auto-handbrake-cfr/build.gradle.kts +++ b/auto-handbrake-cfr/build.gradle.kts @@ -3,8 +3,8 @@ import org.unbrokendome.gradle.plugins.testsets.dsl.testSets plugins { id("org.unbroken-dome.test-sets") version "4.1.0" - id("com.google.cloud.tools.jib") version "3.4.0" - id("org.ajoberstar.grgit") version "5.2.0" + id("com.google.cloud.tools.jib") version "3.4.2" + id("org.ajoberstar.grgit") version "5.2.2" } testSets { diff --git a/base.Dockerfile b/base.Dockerfile index 407b729..f439e77 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -1,6 +1,6 @@ # base HandBrake + Java image -FROM amazoncorretto:21-alpine3.15 +FROM amazoncorretto:21.0.1-alpine3.15 # Compile HandBrake # credit: https://github.com/txstate-etc/mediaflo-encoder/blob/77bda38311f97903bd11d4fe10a0c516e8d8d145/worker/Dockerfile diff --git a/build.gradle.kts b/build.gradle.kts index d754177..3496c92 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,8 +11,8 @@ logger.quiet("Gradle version: ${gradle.gradleVersion}") plugins { id("java-library") - id("com.diffplug.gradle.spotless") version "6.22.0" apply (false) - id("com.github.spotbugs") version "5.1.5" apply (false) + id("com.diffplug.gradle.spotless") version "6.25.0" apply (false) + id("com.github.spotbugs") version "6.0.13" apply (false) id("com.asarkar.gradle.build-time-tracker") version "4.3.0" } @@ -90,15 +90,15 @@ subprojects { } dependencies { - val log4jVersion = "2.20.0" - val guavaVersion = "32.1.3-jre" + val log4jVersion = "2.23.1" + val guavaVersion = "33.1.0-jre" implementation("org.apache.logging.log4j:log4j-core:$log4jVersion") - implementation("com.github.spotbugs:spotbugs-annotations:4.8.0") + implementation("com.github.spotbugs:spotbugs-annotations:4.8.4") implementation("com.google.guava:guava:$guavaVersion") - val junitVersion = "5.10.0" - val truthVersion = "1.1.5" - val mockitoVersion = "5.6.0" + val junitVersion = "5.10.2" + val truthVersion = "1.4.2" + val mockitoVersion = "5.11.0" testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion") testImplementation("com.google.truth:truth:$truthVersion") testImplementation("com.google.truth.extensions:truth-java8-extension:$truthVersion")