Skip to content

Commit e61f583

Browse files
JoseLionJoseLion
authored
feat(deps): Update dependencies 2024.01.20 (#125)
1 parent ac16e5d commit e61f583

File tree

7 files changed

+77
-61
lines changed

7 files changed

+77
-61
lines changed

‎build.gradle

+8-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ plugins {
1717
group = 'io.github.joselion'
1818

1919
java {
20-
sourceCompatibility = JavaLanguageVersion.of(20)
20+
sourceCompatibility = JavaLanguageVersion.of(21)
2121
toolchain {
2222
languageVersion = JavaLanguageVersion.of(21)
2323
vendor = JvmVendorSpec.ORACLE
@@ -63,6 +63,13 @@ strictNullCheck {
6363
packageInfo.useEclipse()
6464
}
6565

66+
// Workaround for: https://github.com/checkstyle/checkstyle/issues/14211
67+
configurations.checkstyle {
68+
resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
69+
select("com.google.guava:guava:0")
70+
}
71+
}
72+
6673
repositories {
6774
mavenCentral()
6875
}

‎buildscript-gradle.lockfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
# This file is expected to be part of source control.
44
com.gradle.plugin-publish:com.gradle.plugin-publish.gradle.plugin:1.2.1=classpath
55
com.gradle.publish:plugin-publish-plugin:1.2.1=classpath
6-
io.github.joselion.pretty-jupiter:io.github.joselion.pretty-jupiter.gradle.plugin:3.1.0=classpath
6+
io.github.joselion.pretty-jupiter:io.github.joselion.pretty-jupiter.gradle.plugin:3.2.0=classpath
77
io.github.joselion.strict-null-check:io.github.joselion.strict-null-check.gradle.plugin:3.2.0=classpath
88
io.github.joselion:maybe:3.3.1=classpath
9-
io.github.joselion:pretty-jupiter:3.1.0=classpath
9+
io.github.joselion:pretty-jupiter:3.2.0=classpath
1010
io.github.joselion:strict-null-check:3.2.0=classpath
11-
name.remal.gradle-plugins.sonarlint:sonarlint:3.3.14=classpath
12-
name.remal.sonarlint:name.remal.sonarlint.gradle.plugin:3.3.14=classpath
11+
name.remal.gradle-plugins.sonarlint:sonarlint:3.4.4=classpath
12+
name.remal.sonarlint:name.remal.sonarlint.gradle.plugin:3.4.4=classpath
1313
org.apache.maven:maven-model:3.6.3=classpath
1414
empty=

‎gradle.lockfile

+44-39
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@ com.fasterxml.staxmate:staxmate:2.4.0=sonarlintCoreClasspath
55
com.fasterxml.woodstox:woodstox-core:6.4.0=sonarlintCoreClasspath
66
com.google.code.findbugs:jsr305:3.0.2=checkstyle,sonarlintCoreClasspath
77
com.google.code.gson:gson:2.8.9=sonarlintCoreClasspath
8-
com.google.collections:google-collections:1.0=checkstyle
9-
com.google.errorprone:error_prone_annotations:2.18.0=checkstyle
10-
com.google.guava:failureaccess:1.0.1=checkstyle
11-
com.google.guava:guava:32.0.1-jre=checkstyle
8+
com.google.errorprone:error_prone_annotations:2.23.0=checkstyle
9+
com.google.guava:failureaccess:1.0.2=checkstyle
10+
com.google.guava:guava:33.0.0-jre=checkstyle
1211
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle
13-
com.google.j2objc:j2objc-annotations:2.8=checkstyle
14-
com.puppycrawl.tools:checkstyle:10.12.4=checkstyle
12+
com.puppycrawl.tools:checkstyle:10.12.7=checkstyle
1513
commons-beanutils:commons-beanutils:1.9.4=checkstyle
1614
commons-codec:commons-codec:1.15=checkstyle
1715
commons-collections:commons-collections:3.2.2=checkstyle
1816
commons-io:commons-io:2.11.0=sonarlintCoreClasspath
1917
info.picocli:picocli:4.7.5=checkstyle
20-
io.github.joselion:maybe:3.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
21-
net.bytebuddy:byte-buddy-agent:1.14.9=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
22-
net.bytebuddy:byte-buddy:1.14.9=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
23-
net.sf.saxon:Saxon-HE:12.3=checkstyle
18+
io.github.joselion:maybe:3.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
19+
jakarta.el:jakarta.el-api:4.0.0=sonarlintCoreClasspath
20+
net.bytebuddy:byte-buddy-agent:1.14.11=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
21+
net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
22+
net.sf.saxon:Saxon-HE:12.4=checkstyle
2423
org.antlr:antlr4-runtime:4.13.1=checkstyle
2524
org.apache.commons:commons-compress:1.21=sonarlintCoreClasspath
2625
org.apache.commons:commons-lang3:3.12.0=sonarlintCoreClasspath
@@ -35,30 +34,31 @@ org.apache.maven.doxia:doxia-core:1.12.0=checkstyle
3534
org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle
3635
org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
3736
org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
38-
org.apache.tomcat.embed:tomcat-embed-core:9.0.81=sonarlintCoreClasspath
39-
org.apache.tomcat.embed:tomcat-embed-el:9.0.81=sonarlintCoreClasspath
40-
org.apache.tomcat.embed:tomcat-embed-jasper:9.0.81=sonarlintCoreClasspath
41-
org.apache.tomcat:tomcat-annotations-api:9.0.81=sonarlintCoreClasspath
37+
org.apache.tomcat.embed:tomcat-embed-core:9.0.84=sonarlintCoreClasspath
38+
org.apache.tomcat.embed:tomcat-embed-el:9.0.84=sonarlintCoreClasspath
39+
org.apache.tomcat.embed:tomcat-embed-jasper:9.0.84=sonarlintCoreClasspath
40+
org.apache.tomcat:tomcat-annotations-api:9.0.84=sonarlintCoreClasspath
4241
org.apache.xbean:xbean-reflect:3.7=checkstyle
4342
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testkitCompileClasspath
44-
org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
45-
org.checkerframework:checker-qual:3.27.0=checkstyle
43+
org.assertj:assertj-core:3.25.1=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
44+
org.checkerframework:checker-qual:3.42.0=checkstyle
4645
org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
4746
org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
4847
org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
4948
org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
5049
org.codehaus.woodstox:stax2-api:4.2.1=sonarlintCoreClasspath
5150
org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.700=compileClasspath,testCompileClasspath,testkitCompileClasspath
51+
org.glassfish:jakarta.el:4.0.2=sonarlintCoreClasspath
5252
org.javassist:javassist:3.28.0-GA=checkstyle
53-
org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
54-
org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath,testkitRuntimeClasspath
55-
org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
56-
org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
57-
org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
58-
org.junit.platform:junit-platform-engine:1.10.0=testRuntimeClasspath,testkitRuntimeClasspath
59-
org.junit.platform:junit-platform-launcher:1.10.0=testRuntimeClasspath,testkitRuntimeClasspath
60-
org.junit:junit-bom:5.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
61-
org.mockito:mockito-core:5.7.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
53+
org.junit.jupiter:junit-jupiter-api:5.10.1=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
54+
org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath,testkitRuntimeClasspath
55+
org.junit.jupiter:junit-jupiter-params:5.10.1=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
56+
org.junit.jupiter:junit-jupiter:5.10.1=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
57+
org.junit.platform:junit-platform-commons:1.10.1=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
58+
org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath,testkitRuntimeClasspath
59+
org.junit.platform:junit-platform-launcher:1.10.1=testRuntimeClasspath,testkitRuntimeClasspath
60+
org.junit:junit-bom:5.10.1=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
61+
org.mockito:mockito-core:5.9.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
6262
org.objenesis:objenesis:3.3=testRuntimeClasspath,testkitRuntimeClasspath
6363
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
6464
org.ow2.asm:asm:9.0=sonarlintCoreClasspath
@@ -69,25 +69,30 @@ org.sonarsource.analyzer-commons:sonar-analyzer-recognizers:2.7.0.1482=sonarlint
6969
org.sonarsource.analyzer-commons:sonar-performance-measure:2.7.0.1482=sonarlintCoreClasspath
7070
org.sonarsource.analyzer-commons:sonar-regex-parsing:2.7.0.1482=sonarlintCoreClasspath
7171
org.sonarsource.analyzer-commons:sonar-xml-parsing:2.7.0.1482=sonarlintCoreClasspath
72-
org.sonarsource.java:external-reports:7.27.1.33504=sonarlintCoreClasspath
73-
org.sonarsource.java:java-checks:7.27.1.33504=sonarlintCoreClasspath
74-
org.sonarsource.java:java-frontend:7.27.1.33504=sonarlintCoreClasspath
75-
org.sonarsource.java:java-jsp:7.27.1.33504=sonarlintCoreClasspath
76-
org.sonarsource.java:java-surefire:7.27.1.33504=sonarlintCoreClasspath
77-
org.sonarsource.java:java-symbolic-execution:7.27.1.33504=sonarlintCoreClasspath
78-
org.sonarsource.java:jdt:7.27.1.33504=sonarlintCoreClasspath
79-
org.sonarsource.java:sonar-java-plugin:7.27.1.33504=sonarlintCoreClasspath
80-
org.sonarsource.javascript:css:10.8.0.24207=sonarlintCoreClasspath
81-
org.sonarsource.javascript:javascript-checks:10.8.0.24207=sonarlintCoreClasspath
82-
org.sonarsource.javascript:sonar-javascript-plugin:10.8.0.24207=sonarlintCoreClasspath
83-
org.sonarsource.kotlin:sonar-kotlin-plugin:2.18.0.2938=sonarlintCoreClasspath
72+
org.sonarsource.html:sonar-html-plugin:3.12.0.4743=sonarlintCoreClasspath
73+
org.sonarsource.java:external-reports:7.30.1.34514=sonarlintCoreClasspath
74+
org.sonarsource.java:java-checks-aws:7.30.1.34514=sonarlintCoreClasspath
75+
org.sonarsource.java:java-checks-common:7.30.1.34514=sonarlintCoreClasspath
76+
org.sonarsource.java:java-checks:7.30.1.34514=sonarlintCoreClasspath
77+
org.sonarsource.java:java-frontend:7.30.1.34514=sonarlintCoreClasspath
78+
org.sonarsource.java:java-jsp:7.30.1.34514=sonarlintCoreClasspath
79+
org.sonarsource.java:java-surefire:7.30.1.34514=sonarlintCoreClasspath
80+
org.sonarsource.java:java-symbolic-execution:7.30.1.34514=sonarlintCoreClasspath
81+
org.sonarsource.java:jdt:7.30.1.34514=sonarlintCoreClasspath
82+
org.sonarsource.java:sonar-java-plugin:7.30.1.34514=sonarlintCoreClasspath
83+
org.sonarsource.javascript:css:10.11.1.25225=sonarlintCoreClasspath
84+
org.sonarsource.javascript:javascript-checks:10.11.1.25225=sonarlintCoreClasspath
85+
org.sonarsource.javascript:sonar-javascript-plugin:10.11.1.25225=sonarlintCoreClasspath
86+
org.sonarsource.kotlin:sonar-kotlin-plugin:2.20.0.4382=sonarlintCoreClasspath
8487
org.sonarsource.slang:sonar-ruby-plugin:1.15.0.4655=sonarlintCoreClasspath
8588
org.sonarsource.slang:sonar-scala-plugin:1.15.0.4655=sonarlintCoreClasspath
86-
org.sonarsource.sonarlint.core:sonarlint-core:9.4.0.76070=sonarlintCore,sonarlintCoreClasspath
89+
org.sonarsource.sonarlint.core:sonarlint-core:9.6.1.76766=sonarlintCore,sonarlintCoreClasspath
8790
org.sonarsource.sslr:sslr-core:1.24.0.633=sonarlintCoreClasspath
8891
org.sonarsource.xml:sonar-xml-plugin:2.10.0.4108=sonarlintCoreClasspath
92+
org.springframework:spring-core:5.3.31=sonarlintCoreClasspath
93+
org.springframework:spring-expression:5.3.31=sonarlintCoreClasspath
8994
org.tukaani:xz:1.9=sonarlintCoreClasspath
90-
org.xmlresolver:xmlresolver:5.2.0=checkstyle
95+
org.xmlresolver:xmlresolver:5.2.2=checkstyle
9196
xerces:xercesImpl:2.12.2=sonarlintCoreClasspath
9297
xml-apis:xml-apis:1.4.01=sonarlintCoreClasspath
9398
empty=

‎gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎settings.gradle

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
1+
plugins {
2+
id('org.gradle.toolchains.foojay-resolver-convention') version '0.8.0'
3+
}
4+
15
rootProject.name = 'strict-null-check'
26

37
dependencyResolutionManagement {
48
versionCatalogs {
59
libs {
6-
version('checkstyle', '10.12.4')
7-
version('junit', '5.10.0')
8-
version('sonarlint-core', '9.4.0.76070')
10+
version('checkstyle', '10.12.7')
11+
version('junit', '5.10.1')
12+
version('sonarlint-core', '9.6.1.76766')
913

1014
plugin('pluginPublish', 'com.gradle.plugin-publish').version('1.2.1')
11-
plugin('prettyJupiter', 'io.github.joselion.pretty-jupiter').version('3.1.0')
12-
plugin('sonarlint', 'name.remal.sonarlint').version('3.3.14')
15+
plugin('prettyJupiter', 'io.github.joselion.pretty-jupiter').version('3.2.0')
16+
plugin('sonarlint', 'name.remal.sonarlint').version('3.4.4')
1317
plugin('strictNullCheck', 'io.github.joselion.strict-null-check').version('3.2.0')
1418

15-
library('assertj', 'org.assertj', 'assertj-core').version('3.24.2')
19+
library('assertj', 'org.assertj', 'assertj-core').version('3.25.1')
1620
library('lombok', 'org.projectlombok', 'lombok').version('1.18.30')
17-
library('maybe', 'io.github.joselion', 'maybe').version('3.3.1')
18-
library('mockito', 'org.mockito', 'mockito-core').version('5.7.0')
19-
library('sonarlint-java', 'org.sonarsource.java', 'sonar-java-plugin').version('7.27.1.33504')
21+
library('maybe', 'io.github.joselion', 'maybe').version('3.5.0')
22+
library('mockito', 'org.mockito', 'mockito-core').version('5.9.0')
23+
library('sonarlint-java', 'org.sonarsource.java', 'sonar-java-plugin').version('7.30.1.34514')
2024
}
2125
}
2226
}

‎src/main/java/io/github/joselion/strictnullcheck/lib/GeneratePackageInfoTask.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ public Set<String> getSourcePackages() {
5050
.flatMap(sourceSet -> sourceSet.getAllJava().getSrcDirs().stream())
5151
.map(File::toPath)
5252
.filter(path -> !path.startsWith(getGeneratedDir().getPath()))
53-
.flatMap(path -> Maybe.just(path).resolve(Files::walk).orElseGet(Stream::empty))
53+
.flatMap(path -> Maybe.of(path).solve(Files::walk).orElseGet(Stream::empty))
5454
.filter(subdir -> Files.notExists(subdir.resolve("package-info.java")))
55-
.flatMap(subdir -> Maybe.just(subdir).resolve(Files::list).orElseGet(Stream::empty))
55+
.flatMap(subdir -> Maybe.of(subdir).solve(Files::list).orElseGet(Stream::empty))
5656
.filter(path -> FileSystems.getDefault().getPathMatcher("glob:*.java").matches(path.getFileName()))
5757
.map(path ->
58-
Maybe.just(path)
59-
.resolve(Files::readString)
58+
Maybe.of(path)
59+
.solve(Files::readString)
6060
.map(Pattern.compile("^package (.+);")::matcher)
6161
.orThrow(RuntimeException::new)
6262
)
@@ -88,9 +88,9 @@ private void buildPackageInfo(final String packageName) {
8888
final var templateOutput = getPackageInfoTemplate(packageName);
8989
final var outputFile = new File(dir.getAbsolutePath(), "package-info.java");
9090

91-
Maybe.just(outputFile)
92-
.resolve(File::createNewFile)
93-
.runEffect(wasCreated -> {
91+
Maybe.of(outputFile)
92+
.solve(File::createNewFile)
93+
.effect(wasCreated -> {
9494
if (wasCreated.booleanValue()) {
9595
Files.writeString(outputFile.toPath(), templateOutput);
9696
}

0 commit comments

Comments
 (0)