Skip to content

Commit

Permalink
fix(compat): Java 17 compatibility and rebump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
JoseLion committed Jul 12, 2024
1 parent bc956d2 commit ccfb097
Show file tree
Hide file tree
Showing 14 changed files with 520 additions and 1,255 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
check-latest: true
- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/wrapper-validation@v3
- uses: github/codeql-action/init@v2
- uses: github/codeql-action/init@v3
with:
languages: java-kotlin
- run: ./gradlew build -x check
- uses: github/codeql-action/analyze@v2
- uses: github/codeql-action/analyze@v3
with:
category: /language:java-kotlin
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.3.0
22.4.1
626 changes: 313 additions & 313 deletions .yarn/releases/yarn-4.2.2.cjs → .yarn/releases/yarn-4.3.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ plugins:
path: .yarn/plugins/@yarnpkg/plugin-engines.cjs
spec: "https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js"

yarnPath: .yarn/releases/yarn-4.2.2.cjs
yarnPath: .yarn/releases/yarn-4.3.1.cjs
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ plugins {
group = 'io.github.joselion'

java {
sourceCompatibility = JavaLanguageVersion.of(22)
sourceCompatibility = JavaLanguageVersion.of(17)
toolchain {
languageVersion = JavaLanguageVersion.of(22)
vendor = JvmVendorSpec.ORACLE
Expand Down
4 changes: 2 additions & 2 deletions buildscript-gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ io.github.joselion.strict-null-check:io.github.joselion.strict-null-check.gradle
io.github.joselion:maybe:3.5.0=classpath
io.github.joselion:pretty-jupiter:3.3.0=classpath
io.github.joselion:strict-null-check:3.3.0=classpath
name.remal.gradle-plugins.sonarlint:sonarlint:4.2.3=classpath
name.remal.sonarlint:name.remal.sonarlint.gradle.plugin:4.2.3=classpath
name.remal.gradle-plugins.sonarlint:sonarlint:4.2.6=classpath
name.remal.sonarlint:name.remal.sonarlint.gradle.plugin:4.2.6=classpath
org.apache.maven:maven-model:3.6.3=classpath
empty=
39 changes: 20 additions & 19 deletions gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ commons-io:commons-io:2.15.1=sonarlintCoreClasspath
info.picocli:picocli:4.7.6=checkstyle
jakarta.el:jakarta.el-api:4.0.0=sonarlintCoreClasspath
net.bytebuddy:byte-buddy-agent:1.14.15=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
net.bytebuddy:byte-buddy:1.14.16=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
net.sf.saxon:Saxon-HE:12.4=checkstyle
org.antlr:antlr4-runtime:4.13.1=checkstyle
org.apache.commons:commons-compress:1.26.0=sonarlintCoreClasspath
Expand All @@ -39,7 +39,7 @@ org.apache.tomcat.embed:tomcat-embed-jasper:9.0.84=sonarlintCoreClasspath
org.apache.tomcat:tomcat-annotations-api:9.0.84=sonarlintCoreClasspath
org.apache.xbean:xbean-reflect:3.7=checkstyle
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testkitCompileClasspath
org.assertj:assertj-core:3.26.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.assertj:assertj-core:3.26.3=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.checkerframework:checker-qual:3.43.0=checkstyle
org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
Expand All @@ -53,38 +53,39 @@ org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt
org.jacoco:org.jacoco.core:0.8.12=jacocoAnt
org.jacoco:org.jacoco.report:0.8.12=jacocoAnt
org.javassist:javassist:3.28.0-GA=checkstyle
org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:5.10.2=testRuntimeClasspath,testkitRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.junit.jupiter:junit-jupiter:5.10.2=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.junit.platform:junit-platform-engine:1.10.2=testRuntimeClasspath,testkitRuntimeClasspath
org.junit.platform:junit-platform-launcher:1.10.2=testRuntimeClasspath,testkitRuntimeClasspath
org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:5.10.3=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:5.10.3=testRuntimeClasspath,testkitRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:5.10.3=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.junit.jupiter:junit-jupiter:5.10.3=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.junit.platform:junit-platform-commons:1.10.3=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.junit.platform:junit-platform-engine:1.10.3=testRuntimeClasspath,testkitRuntimeClasspath
org.junit.platform:junit-platform-launcher:1.10.3=testRuntimeClasspath,testkitRuntimeClasspath
org.junit:junit-bom:5.10.3=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.mockito:mockito-core:5.12.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.objenesis:objenesis:3.3=testRuntimeClasspath,testkitRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
org.ow2.asm:asm-commons:9.7=jacocoAnt
org.ow2.asm:asm-tree:9.7=jacocoAnt
org.ow2.asm:asm:9.0=sonarlintCoreClasspath
org.ow2.asm:asm:9.7=jacocoAnt
org.projectlombok:lombok:1.18.32=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath,testkitAnnotationProcessor,testkitCompileClasspath
org.projectlombok:lombok:1.18.34=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath,testkitAnnotationProcessor,testkitCompileClasspath
org.reflections:reflections:0.10.2=checkstyle
org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.11.0.2861=sonarlintCoreClasspath
org.sonarsource.analyzer-commons:sonar-analyzer-recognizers:2.11.0.2861=sonarlintCoreClasspath
org.sonarsource.analyzer-commons:sonar-performance-measure:2.11.0.2861=sonarlintCoreClasspath
org.sonarsource.analyzer-commons:sonar-regex-parsing:2.11.0.2861=sonarlintCoreClasspath
org.sonarsource.analyzer-commons:sonar-xml-parsing:2.11.0.2861=sonarlintCoreClasspath
org.sonarsource.html:sonar-html-plugin:3.16.0.5274=sonarlintCoreClasspath
org.sonarsource.java:external-reports:8.0.0.36314=sonarlintCoreClasspath
org.sonarsource.java:java-checks-aws:8.0.0.36314=sonarlintCoreClasspath
org.sonarsource.java:java-checks-common:8.0.0.36314=sonarlintCoreClasspath
org.sonarsource.java:java-checks:8.0.0.36314=sonarlintCoreClasspath
org.sonarsource.java:java-frontend:8.0.0.36314=sonarlintCoreClasspath
org.sonarsource.java:java-jsp:8.0.0.36314=sonarlintCoreClasspath
org.sonarsource.java:java-surefire:8.0.0.36314=sonarlintCoreClasspath
org.sonarsource.java:check-list:8.1.0.36477=sonarlintCoreClasspath
org.sonarsource.java:external-reports:8.1.0.36477=sonarlintCoreClasspath
org.sonarsource.java:java-checks-aws:8.1.0.36477=sonarlintCoreClasspath
org.sonarsource.java:java-checks-common:8.1.0.36477=sonarlintCoreClasspath
org.sonarsource.java:java-checks:8.1.0.36477=sonarlintCoreClasspath
org.sonarsource.java:java-frontend:8.1.0.36477=sonarlintCoreClasspath
org.sonarsource.java:java-jsp:8.1.0.36477=sonarlintCoreClasspath
org.sonarsource.java:java-surefire:8.1.0.36477=sonarlintCoreClasspath
org.sonarsource.java:jdt-package:1.1.0.34=sonarlintCoreClasspath
org.sonarsource.java:sonar-java-plugin:8.0.0.36314=sonarlintCoreClasspath
org.sonarsource.java:sonar-java-plugin:8.1.0.36477=sonarlintCoreClasspath
org.sonarsource.javascript:css:10.14.0.26080=sonarlintCoreClasspath
org.sonarsource.javascript:javascript-checks:10.14.0.26080=sonarlintCoreClasspath
org.sonarsource.javascript:sonar-javascript-plugin:10.14.0.26080=sonarlintCoreClasspath
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.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https:/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"author": "JoseLion <[email protected]>",
"license": "MIT",
"engines": {
"node": "22.3.0"
"node": "^22.4.1"
},
"packageManager": "yarn@4.2.2",
"packageManager": "yarn@4.3.1",
"scripts": {
"release": "semantic-release"
},
Expand Down
10 changes: 5 additions & 5 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ dependencyResolutionManagement {
libs {
version('checkstyle', '10.17.0')
version('jacoco', '0.8.12')
version('junit', '5.10.2')
version('junit', '5.10.3')

plugin('pluginPublish', 'com.gradle.plugin-publish').version('1.2.1')
plugin('prettyJupiter', 'io.github.joselion.pretty-jupiter').version('3.3.0')
plugin('sonarlint', 'name.remal.sonarlint').version('4.2.3')
plugin('sonarlint', 'name.remal.sonarlint').version('4.2.6')
plugin('strictNullCheck', 'io.github.joselion.strict-null-check').version('3.3.0')

library('assertj', 'org.assertj', 'assertj-core').version('3.26.0')
library('lombok', 'org.projectlombok', 'lombok').version('1.18.32')
library('assertj', 'org.assertj', 'assertj-core').version('3.26.3')
library('lombok', 'org.projectlombok', 'lombok').version('1.18.34')
library('mockito', 'org.mockito', 'mockito-core').version('5.12.0')
library('sonarlint-java', 'org.sonarsource.java', 'sonar-java-plugin').version('8.0.0.36314')
library('sonarlint-java', 'org.sonarsource.java', 'sonar-java-plugin').version('8.1.0.36477')
}
}
}
Loading

0 comments on commit ccfb097

Please sign in to comment.