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

Update all dependencies #108

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.6.0
with:
flags: unit-tests-${{ matrix.os }}
fail_ci_if_error: true
Expand All @@ -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
Expand Down Expand Up @@ -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.6.0
with:
flags: integration-tests-${{ matrix.os }}
fail_ci_if_error: true
Expand All @@ -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 .
Expand All @@ -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.9
with:
tag_name: ${{ steps.version.outputs.version_tag }}
generate_release_notes: true
4 changes: 2 additions & 2 deletions auto-handbrake-cfr/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"
id("org.ajoberstar.grgit") version "5.3.0"
}

testSets {
Expand Down
2 changes: 1 addition & 1 deletion base.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 8 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.26" apply (false)
id("com.asarkar.gradle.build-time-tracker") version "4.3.0"
}

Expand Down Expand Up @@ -90,15 +90,15 @@ subprojects {
}

dependencies {
val log4jVersion = "2.20.0"
val guavaVersion = "32.1.3-jre"
val log4jVersion = "2.24.1"
val guavaVersion = "33.3.1-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.6")
implementation("com.google.guava:guava:$guavaVersion")

val junitVersion = "5.10.0"
val truthVersion = "1.1.5"
val mockitoVersion = "5.6.0"
val junitVersion = "5.11.3"
val truthVersion = "1.4.4"
val mockitoVersion = "5.14.2"
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
testImplementation("com.google.truth:truth:$truthVersion")
testImplementation("com.google.truth.extensions:truth-java8-extension:$truthVersion")
Expand Down
Loading