From efd191de82aacabf48c5569b8dfe2c721d6e3fe2 Mon Sep 17 00:00:00 2001 From: astrapi69 Date: Fri, 8 Sep 2023 15:28:49 +0200 Subject: [PATCH] update of JDK to newer version 17 - update gradle to new version 8.3 - update of gradle-plugin dependency 'io.freefair.gradle:lombok-plugin' to new version 8.3 - update of gradle-plugin dependency 'com.github.ben-manes.versions.gradle.plugin' to new version 0.48.0 - update of gradle-plugin dependency 'com.diffplug.spotless:spotless-plugin-gradle' to new version 6.21.0 - update of dependency silly-collection to new major version 27 - update of test dependency icon-img-extensions version to 3 - update of test dependency file-worker version to 17 - update of test dependencies junit-jupiter-* version to 5.10.0 --- .github/workflows/gradle.yml | 12 ++++++------ CHANGELOG.md | 12 +++++++++++- build.gradle | 4 +++- gradle.properties | 18 +++++++++--------- gradle/publishing.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 33 insertions(+), 19 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4b43d6e..cf0b073 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -19,19 +19,19 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' - name: Build with Gradle - uses: gradle/gradle-build-action@bc3340afc5e3cc44f2321809ac090d731c13c514 + uses: gradle/gradle-build-action@v2.8.0 with: arguments: build env: ossrhUsername: ${{secrets.OSSRHUSERNAME}} ossrhPassword: ${{secrets.OSSRHPASSWORD}} - - uses: codecov/codecov-action@v2 + - uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos diff --git a/CHANGELOG.md b/CHANGELOG.md index ef4e527..5867282 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,20 @@ ## Change log ---------------------- -Version 2.8-SNAPSHOT +Version 3-SNAPSHOT ------------- +CHANGED: +- update of JDK to newer version 17 +- update gradle to new version 8.3 +- update of gradle-plugin dependency 'io.freefair.gradle:lombok-plugin' to new version 8.3 +- update of gradle-plugin dependency 'com.github.ben-manes.versions.gradle.plugin' to new version 0.48.0 +- update of gradle-plugin dependency 'com.diffplug.spotless:spotless-plugin-gradle' to new version 6.21.0 +- update of dependency silly-collection to new major version 27 +- update of test dependency icon-img-extensions version to 3 +- update of test dependency file-worker version to 17 +- update of test dependencies junit-jupiter-* version to 5.10.0 Version 2.7 ------------- diff --git a/build.gradle b/build.gradle index 6b58819..936a005 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,9 @@ apply from: "gradle/publishing.gradle" apply from: "gradle/repositories.gradle" apply from: "gradle/testing.gradle" -sourceCompatibility = "$projectSourceCompatibility" as Object +java { + sourceCompatibility = "$projectSourceCompatibility" as Object +} tasks.withType(JavaCompile) { options.encoding = "UTF-8" diff --git a/gradle.properties b/gradle.properties index c8f3acd..f146a96 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ ###################### # project properties # ###################### -projectVersion=2.8-SNAPSHOT +projectVersion=3-SNAPSHOT groupPackage=io.github.astrapi69 -projectSourceCompatibility=11 +projectSourceCompatibility=17 projectInceptionYear=2021 projectHolderUsername=astrapi69 projectLeaderName=Asterios Raptis @@ -28,11 +28,11 @@ projectRepositoriesPasswordKey=ossrhPassword ########################### # gradle-plugins versions # ########################### -gradlePluginLombokVersion=8.1.0 -gradlePluginVersionsVersion=0.47.0 +gradlePluginLombokVersion=8.3 +gradlePluginVersionsVersion=0.48.0 licenseGradlePluginVersion=0.16.1 grgitGradlePluginVersion=5.2.0 -spotlessGradlePluginVersion=6.20.0 +spotlessGradlePluginVersion=6.21.0 ######################### # dependencies versions # ######################### @@ -42,7 +42,7 @@ javahelpVersion=2.0.05 modelDataVersion=2.1 menuActionVersion=2.7 jobjCoreVersion=7.1 -sillyCollectionVersion=21 +sillyCollectionVersion=27 sillyMathVersion=2.2 throwableVersion=2.3 ############################## @@ -50,14 +50,14 @@ throwableVersion=2.3 ############################## assertjSwingVersion=3.17.1 randomizerVersion=9 -iconImgExtensionsVersion=2.1 +iconImgExtensionsVersion=3 testObjectVersion=7.2 -fileWorkerVersion=11.6 +fileWorkerVersion=17 sillyIoVersion=2.2 miglayoutSwingVersion=11.1 meanbeanVersion=2.0.3 junitJupiterExtensionsVersion=1.1 -junitJupiterVersion=5.10.0-RC2 +junitJupiterVersion=5.10.0 ########################## # for deploy on sonatype # ########################## diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index 83fba4e..6a08414 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -8,7 +8,9 @@ task sourcesJar(type: Jar) { task javadocJar(type: Jar) { from javadoc archiveClassifier.set("javadoc") - javadoc.properties.failOnError = true + javadoc { + failOnError = false + } } javadoc { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d728397..1e37fc4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Wed Feb 19 18:39:09 CET 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists