Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

Commit

Permalink
Upgraded Gradle to 8.5. Migrated to JDK 21 in pipeline. (#54)
Browse files Browse the repository at this point in the history
  • Loading branch information
mfvanek authored Dec 3, 2023
1 parent 0b21dbe commit c2fff49
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 22 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up JDK 19
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '19'
cache: 'gradle'
java-version: '21'
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: wrapper
- name: Build with Gradle
run: ./gradlew build
- name: Upload coverage to Codecov
Expand Down
20 changes: 13 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
id("jacoco")
id("checkstyle")
id("pmd")
id("com.github.spotbugs") version "5.2.4"
id("com.github.spotbugs") version "6.0.1"
id("net.ltgt.errorprone") version "3.1.0"
id("maven-publish")
id("io.freefair.lombok") version "8.4"
Expand All @@ -22,14 +22,14 @@ repositories {
}

group = "io.github.mfvanek"
version = "1.4.0-SNAPSHOT"
version = "1.4.1"
description = "Java image resizing console app"

dependencies {
implementation("org.slf4j:slf4j-api:2.0.9")
implementation("ch.qos.logback:logback-classic:1.4.13")
implementation("ch.qos.logback:logback-classic:1.4.14")
implementation("org.apache.commons:commons-lang3:3.14.0")
implementation("commons-io:commons-io:2.15.0")
implementation("commons-io:commons-io:2.15.1")
implementation(platform("org.springframework:spring-framework-bom:6.1.1"))
implementation("org.springframework:spring-context")
implementation("javax.annotation:javax.annotation-api:1.3.2")
Expand All @@ -40,7 +40,7 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-params")
testImplementation("org.springframework:spring-test")
testImplementation("org.assertj:assertj-core:3.24.2")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.3")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.4")

//pitest("it.mulders.stryker:pit-dashboard-reporter:0.2.1")
checkstyle("com.thomasjensen.checkstyle.addons:checkstyle-addons:7.0.1")
Expand All @@ -52,18 +52,24 @@ application {
}

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
withJavadocJar()
withSourcesJar()
}
tasks.withType<JavaCompile>().configureEach {
options.compilerArgs.add("-parameters")
options.errorprone {
disableWarningsInGeneratedCode.set(true)
}
}

tasks {
wrapper {
gradleVersion = "8.5"
}

jar {
manifest {
attributes["Main-Class"] = application.mainClass
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
17 changes: 9 additions & 8 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -201,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ rootProject.name = "image-resizing"
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
version("checkstyle", "10.12.0")
version("checkstyle", "10.12.5")
version("pmd", "6.55.0")
version("jacoco", "0.8.10")
version("lombok", "1.18.28")
version("jacoco", "0.8.11")
version("lombok", "1.18.30")
}
}
}

0 comments on commit c2fff49

Please sign in to comment.