chore(deps): Use Gradle version catalog (#141)

JoseLion · Sep 17, 2023 · be2d38a · be2d38a
1 parent 8d6c8d6
commit be2d38a
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 43 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,8 +10,8 @@ plugins {
  id('java-gradle-plugin')
 
  id('com.gradle.plugin-publish') version '1.2.1'
- id('io.github.joselion.pretty-jupiter') version '2.2.1'
- id('io.github.joselion.strict-null-check') version '2.3.0'
+ id('io.github.joselion.pretty-jupiter') version '3.0.1'
+ id('io.github.joselion.strict-null-check') version '3.0.1'
  id('se.solrike.sonarlint') version '1.0.0-beta.15'
 }
 
@@ -38,7 +38,7 @@ dependencyLocking {
 }
 
 checkstyle {
- setToolVersion('10.12.3')
+ setToolVersion(libs.versions.checkstyle.get())
 }
 
 sonarlint {
@@ -53,36 +53,33 @@ sonarlint {
 }
 
 strictNullCheck {
- versions {
- eclipseAnnotations = '2.2.700'
- findBugs = '3.0.2'
- }
+ packageInfo.useEclipse()
+ source.addEclipse()
 }
 
 repositories {
  mavenCentral()
 }
 
 dependencies {
- annotationProcessor('org.projectlombok:lombok:1.18.28')
- compileOnly('org.projectlombok:lombok:1.18.28')
- sonarlintPlugins('org.sonarsource.java:sonar-java-plugin:7.20.0.31692')
+ annotationProcessor(libs.lombok)
+ compileOnly(libs.lombok)
+ sonarlintPlugins(libs.sonarlint.java)
 
  implementation(localGroovy())
-
- testAnnotationProcessor('org.projectlombok:lombok:1.18.28')
- testCompileOnly('org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.700')
- testCompileOnly('org.projectlombok:lombok:1.18.28')
- testImplementation('org.mockito:mockito-core:5.5.0')
 }
 
 testing {
  suites {
  configureEach {
- useJUnitJupiter('5.10.0')
+ useJUnitJupiter(libs.versions.junit.get())
 
  dependencies {
- implementation('org.assertj:assertj-core:3.24.2')
+ annotationProcessor(libs.lombok)
+ compileOnly(libs.lombok)
+
+ implementation(libs.mockito)
+ implementation(libs.assertj)
  }
  }
 
@@ -109,7 +106,7 @@ prettyJupiter {
 }
 
 jacoco {
- toolVersion('0.8.10')
+ setToolVersion(libs.versions.jacoco.get())
 }
 
 jacocoTestReport {

diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
@@ -4,10 +4,11 @@
 com.gradle.plugin-publish:com.gradle.plugin-publish.gradle.plugin:1.2.1=classpath
 com.gradle.publish:plugin-publish-plugin:1.2.1=classpath
 io.github.furstenheim:copy_down:1.1=classpath
-io.github.joselion.pretty-jupiter:io.github.joselion.pretty-jupiter.gradle.plugin:2.2.1=classpath
-io.github.joselion.strict-null-check:io.github.joselion.strict-null-check.gradle.plugin:2.3.0=classpath
-io.github.joselion:pretty-jupiter:2.2.1=classpath
-io.github.joselion:strict-null-check:2.3.0=classpath
+io.github.joselion.pretty-jupiter:io.github.joselion.pretty-jupiter.gradle.plugin:3.0.1=classpath
+io.github.joselion.strict-null-check:io.github.joselion.strict-null-check.gradle.plugin:3.0.1=classpath
+io.github.joselion:maybe:3.2.0=classpath
+io.github.joselion:pretty-jupiter:3.0.1=classpath
+io.github.joselion:strict-null-check:3.0.1=classpath
 org.apache.commons:commons-lang3:3.11=classpath
 org.apache.commons:commons-text:1.9=classpath
 org.apache.maven:maven-model:3.6.3=classpath

diff --git a/gradle.lockfile b/gradle.lockfile
@@ -1,7 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath
+com.google.code.findbugs:jsr305:3.0.2=checkstyle
 com.google.collections:google-collections:1.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.18.0=checkstyle
 com.google.guava:failureaccess:1.0.1=checkstyle
@@ -13,9 +13,8 @@ commons-beanutils:commons-beanutils:1.9.4=checkstyle
 commons-codec:commons-codec:1.15=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 info.picocli:picocli:4.7.4=checkstyle
-net.bytebuddy:byte-buddy-agent:1.14.6=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.12.21=e2eCompileClasspath,e2eImplementation,e2eRuntimeClasspath,functionalTestCompileClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testkitCompileClasspath,testkitImplementation,testkitRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.6=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.6=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.6=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
 net.sf.saxon:Saxon-HE:12.3=checkstyle
 org.antlr:antlr4-runtime:4.11.1=checkstyle
 org.apache.commons:commons-lang3:3.8.1=checkstyle
@@ -30,36 +29,35 @@ org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
-org.apiguardian:apiguardian-api:1.1.2=e2eCompileClasspath,functionalTestCompileClasspath,testCompileClasspath,testkitCompileClasspath
-org.assertj:assertj-core:3.24.2=e2eCompileClasspath,e2eImplementation,e2eRuntimeClasspath,functionalTestCompileClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitImplementation,testkitRuntimeClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testkitCompileClasspath
+org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
 org.checkerframework:checker-qual:3.27.0=checkstyle
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
-org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600=compileClasspath
-org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.700=testCompileClasspath
+org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.700=compileClasspath,testCompileClasspath,testkitCompileClasspath
 org.jacoco:org.jacoco.agent:0.8.10=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.10=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.10=jacocoAnt
 org.jacoco:org.jacoco.report:0.8.10=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.10.0=e2eCompileClasspath,e2eImplementation,e2eRuntimeClasspath,functionalTestCompileClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitImplementation,testkitRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.10.0=e2eImplementation,e2eRuntimeClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testRuntimeClasspath,testkitImplementation,testkitRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.10.0=e2eCompileClasspath,e2eImplementation,e2eRuntimeClasspath,functionalTestCompileClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitImplementation,testkitRuntimeClasspath
-org.junit.jupiter:junit-jupiter:5.10.0=e2eCompileClasspath,e2eImplementation,e2eRuntimeClasspath,functionalTestCompileClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitImplementation,testkitRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.0=e2eCompileClasspath,e2eImplementation,e2eRuntimeClasspath,functionalTestCompileClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitImplementation,testkitRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.0=e2eImplementation,e2eRuntimeClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testRuntimeClasspath,testkitImplementation,testkitRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.10.0=e2eRuntimeClasspath,functionalTestRuntimeClasspath,testRuntimeClasspath,testkitRuntimeClasspath
-org.junit:junit-bom:5.10.0=e2eCompileClasspath,e2eImplementation,e2eRuntimeClasspath,functionalTestCompileClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitImplementation,testkitRuntimeClasspath
-org.mockito:mockito-core:5.5.0=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=e2eCompileClasspath,e2eImplementation,e2eRuntimeClasspath,functionalTestCompileClasspath,functionalTestImplementation,functionalTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitImplementation,testkitRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath,testkitRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
+org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.10.0=testRuntimeClasspath,testkitRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.10.0=testRuntimeClasspath,testkitRuntimeClasspath
+org.junit:junit-bom:5.10.0=testCompileClasspath,testRuntimeClasspath,testkitCompileClasspath,testkitRuntimeClasspath
+org.mockito:mockito-core:5.5.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.5=jacocoAnt
 org.ow2.asm:asm-tree:9.5=jacocoAnt
 org.ow2.asm:asm:9.5=jacocoAnt
-org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath,testkitAnnotationProcessor,testkitCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle
 org.sonarsource.java:sonar-java-plugin:7.20.0.31692=sonarlintPlugins
 org.xmlresolver:xmlresolver:5.2.0=checkstyle
-empty=e2eAnnotationProcessor,functionalTestAnnotationProcessor,runtimeClasspath,sonarlint,testkitAnnotationProcessor
+empty=runtimeClasspath,sonarlint
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,16 @@
 rootProject.name = 'pretty-jupiter'
+
+dependencyResolutionManagement {
+ versionCatalogs {
+ libs {
+ version('checkstyle', '10.12.3')
+ version('jacoco', '0.8.10')
+ version('junit', '5.10.0')
+
+ library('assertj', 'org.assertj', 'assertj-core').version('3.24.2')
+ library('lombok', 'org.projectlombok', 'lombok').version('1.18.28')
+ library('mockito', 'org.mockito', 'mockito-core').version('5.5.0')
+ library('sonarlint-java', 'org.sonarsource.java', 'sonar-java-plugin').version('7.20.0.31692')
+ }
+ }
+}