update to gradle 7.4.2

benchmark/build.gradle

@@ -15,7 +15,7 @@ dependencies {
     implementation project(':datastructures-json-minimal')
     implementation project(':datastructures-json-noggit')
     implementation project(':datastructures-json-simple')
-    implementation "com.google.code.gson:gson:${project.property('gson.version')}"
+    implementation libs.gson
-    implementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
+    implementation libs.jackson.databind
-    implementation "org.json:json:${project.property('orgjson.version')}"
+    implementation libs.orgjson
 }

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 wrapper {
-    gradleVersion = "${rootProject.property('gradle.wrapper.version')}"
+    gradleVersion = libs.versions.gradle.get()
     distributionType = Wrapper.DistributionType.ALL
 }
 

datastructures-bytes/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    api "net.openhft:chronicle-core:2.21ea14"
+    api libs.chronicle.core
-    testImplementation "org.junit.vintage:junit-vintage-engine:5.7.0"
+    testImplementation libs.junit.vintage.engine
-    testImplementation "junit:junit:4.13"
+    testImplementation libs.junit4
-    testImplementation "net.openhft:affinity:3.21ea0"
+    testImplementation libs.affinity
 }

datastructures-json-dsl/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    api "org.xbib:jsr-305:1.0.0"
+    api libs.jsr305
-    testImplementation "junit:junit:4.13.2"
+    testImplementation libs.junit4
-}
+}

datastructures-json-iterator/build.gradle

@@ -1,9 +1,9 @@
 dependencies {
-    implementation "org.javassist:javassist:${project.property('javassist.version')}"
+    implementation libs.javassist
-    testImplementation "junit:junit:4.13.2"
+    testImplementation libs.junit4
-    testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
+    testImplementation libs.jackson
-    testImplementation "com.google.code.gson:gson:${project.property('gson.version')}"
+    testImplementation libs.gson
-    jmhImplementation "com.google.code.gson:gson:${project.property('gson.version')}"
+    jmhImplementation libs.gson
-    jmhImplementation "com.fasterxml.jackson.core:jackson-annotations:${project.property('jackson.version')}"
+    jmhImplementation libs.jackson.annotations
-    jmhImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
+    jmhImplementation libs.jackson.databind
-}
+}

datastructures-json-minimal/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    testImplementation("org.mockito:mockito-core:${project.property('mockito.version')}") {
+    testImplementation(libs.mockito.core) {
         exclude group: 'org.hamcrest'
     }
-}
+}

datastructures-queue-tape/build.gradle

@@ -1,14 +1,14 @@
 dependencies {
-    testCompileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    testCompileOnly libs.jsr305
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation libs.junit4
-    testImplementation 'com.google.truth:truth:0.32'
+    testImplementation libs.google.truth
-    testImplementation 'com.squareup.burst:burst-junit4:1.1.1'
+    testImplementation libs.burst.junit4
-    testImplementation 'com.squareup.okio:okio:1.13.0'
+    testImplementation libs.okio
-    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:5.7.2"
+    testRuntimeOnly libs.junit.vintage.engine
 }
 
 test {
     useJUnitPlatform {
         includeEngines 'junit-jupiter', 'junit-vintage'
     }
-}
+}

datastructures-validation/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    api "org.xbib:jsr-305:${project.property('jsr305.version')}"
+    api libs.jsr305.v2
-    testImplementation "org.assertj:assertj-core:${project.property('assertj.version')}"
+    testImplementation libs.assertj
-    testImplementation "com.google.testing.compile:compile-testing:${project.property('google-testing.version')}"
+    testImplementation libs.compile.testing
-}
+}

datastructures-xslx/build.gradle

@@ -1,3 +1,3 @@
 dependencies {
-  implementation "net.sourceforge.jexcelapi:jxl:${project.property('jxl.version')}"
+  implementation libs.jxl
 }

gradle.properties

@@ -3,14 +3,3 @@ name = datastructures
 version = 1.0.0
 
 org.gradle.warning.mode = ALL
-gradle.wrapper.version = 7.3.2
-mockito.version = 3.12.4
-jxl.version = 2.6.12
-gson.version = 2.8.9
-jackson.version = 2.12.4
-orgjson.version = 20210307
-jsoniter.version = 0.9.23
-javassist.version = 3.28.0-GA
-assertj.version = 3.22.0
-jsr305.version = 2.0.0
-google-testing.version = 0.19

gradle/test/junit5.gradle

@@ -1,12 +1,9 @@
 
-def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.8.2'
-def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
-
 dependencies {
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testImplementation libs.junit.jupiter.api
-    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
+    testImplementation libs.junit.jupiter.params
-    testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
+    testImplementation libs.hamcrest
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+    testRuntimeOnly libs.junit.jupiter.engine
 }
 
 test {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,3 +1,36 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            version('gradle', '7.4.2')
+            version('junit', '5.8.2')
+            version('jackson', '2.12.7')
+            library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
+            library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
+            library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
+            library('junit-vintage-engine', 'org.junit.vintage', 'junit-vintage-engine').versionRef('junit')
+            library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
+            library('junit4', 'junit', 'junit').version('4.13.2')
+            library('chronicle-core', 'net.openhft', 'chronicle-core').version('2.21ea14')
+            library('affinity', 'net.openhft', 'affinity').version('3.21ea0')
+            library('jsr305', 'org.xbib', 'jsr-305').version('1.0.0')
+            library('jsr305-v2', 'org.xbib', 'jsr-305').version('2.0.0')
+            library('javassist', 'org.javassist', 'javassist').version('3.28.0-GA')
+            library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson')
+            library('gson', 'com.google.code.gson', 'gson').version('2.8.9')
+            library('orgjson', 'org.json', 'json').version('20210307')
+            library('jackson-annotations', 'com.fasterxml.jackson.core', 'jackson-annotations').versionRef('jackson')
+            library('jackson-databind', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson')
+            library('mockito-core', 'org.mockito', 'mockito-core').version('3.12.4')
+            library('google-truth', 'com.google.truth', 'truth').version('0.32')
+            library('burst-junit4', 'com.squareup.burst', 'burst-junit4').version('1.1.1')
+            library('okio', 'com.squareup.okio', 'okio').version('1.13.0')
+            library('assertj', 'org.assertj', 'assertj-core').version('3.22.0')
+            library('compile-testing', 'com.google.testing.compile', 'compile-testing').version('0.19')
+            library('jxl', 'net.sourceforge.jexcelapi', 'jxl').version('2.6.12')
+        }
+    }
+}
+
 include 'datastructures-api'
 include 'datastructures-io'
 include 'datastructures-bytes'
@@ -9,7 +42,6 @@ include 'datastructures-xslx'
 include 'datastructures-json-dsl'
 include 'datastructures-json-flat'
 include 'datastructures-json-iterator'
-include 'datastructures-json-jackson'
 include 'datastructures-json-micro'
 include 'datastructures-json-minimal'
 include 'datastructures-json-noggit'