From 8cb2d4e215239d2be666250c9c56724434b65e0a Mon Sep 17 00:00:00 2001 From: Asterios Raptis Date: Fri, 21 Jun 2024 17:28:18 +0200 Subject: [PATCH] update of gradle to new version 8.8 - update of lombok to new version 1.18.32 - update of gradle-plugin dependency 'io.freefair.gradle:lombok-plugin' to new version 8.6 - update of gradle-plugin dependency 'com.github.ben-manes.versions.gradle.plugin' to new version 0.51.0 - update of gradle-plugin dependency 'org.ajoberstar.grgit:grgit-gradle' to new version 5.2.2 - update of gradle-plugin dependency 'com.diffplug.spotless:spotless-plugin-gradle' to new minor version 7.0.0.BETA1 --- .github/workflows/gradle.yml | 37 ++++++++++++------------ gradle/libs.versions.toml | 8 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index cf0b073..29fb35a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,9 +9,9 @@ name: Java CI with Gradle on: push: - branches: [ develop ] + branches: [ main, develop ] pull_request: - branches: [ develop ] + branches: [ main, develop ] jobs: build: @@ -19,19 +19,20 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - - name: Build with Gradle - uses: gradle/gradle-build-action@v2.8.0 - with: - arguments: build - env: - ossrhUsername: ${{secrets.OSSRHUSERNAME}} - ossrhPassword: ${{secrets.OSSRHPASSWORD}} - - uses: codecov/codecov-action@v3 - with: - token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos + - name: Checkout sources + uses: actions/checkout@v4 + - name: Setup Java + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Execute Gradle build + run: ./gradlew build + env: + ossrhUsername: ${{secrets.OSSRHUSERNAME}} + ossrhPassword: ${{secrets.OSSRHPASSWORD}} + - uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f117ea8..78b6a22 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -commons-lang3-version = "3.13.0" +commons-lang3-version = "3.14.0" gradle-plugin-grgit-version = "5.2.2" gradle-plugin-license-version = "0.16.1" gradle-plugin-lombok-version = "8.6" @@ -8,9 +8,9 @@ gradle-plugin-version-catalog-update-version = "0.8.4" gradle-plugin-versions-version = "0.51.0" hamcrest-all-version = "1.3" jdk-serializable-functional-version = "1.9.0" -lombok-version = "1.18.30" -test-object-version = "8" -testng-version = "7.8.0" +lombok-version = "1.18.32" +test-object-version = "8.2" +testng-version = "7.10.2" [libraries] commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commons-lang3-version" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e39c49..4f3882e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Tue May 26 22:30:57 CEST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists