diff --git a/datastructures-json-dsl/build.gradle b/datastructures-json-dsl/build.gradle index b1bd6ef..93834ab 100644 --- a/datastructures-json-dsl/build.gradle +++ b/datastructures-json-dsl/build.gradle @@ -1,3 +1,3 @@ dependencies { - testImplementation libs.junit4 + testImplementation testLibs.junit4 } diff --git a/datastructures-json-iterator/build.gradle b/datastructures-json-iterator/build.gradle index 3bb9dff..fd90a34 100644 --- a/datastructures-json-iterator/build.gradle +++ b/datastructures-json-iterator/build.gradle @@ -3,10 +3,10 @@ apply from: rootProject.file('gradle/test/jmh.gradle') dependencies { implementation libs.javassist - testImplementation libs.junit4 - testImplementation libs.jackson - testImplementation libs.gson - jmhImplementation libs.gson - jmhImplementation libs.jackson.annotations - jmhImplementation libs.jackson.databind + testImplementation testLibs.junit4 + testImplementation testLibs.jackson + testImplementation testLibs.gson + jmhImplementation testLibs.gson + jmhImplementation testLibs.jackson.annotations + jmhImplementation testLibs.jackson.databind } diff --git a/datastructures-json-minimal/build.gradle b/datastructures-json-minimal/build.gradle index 5a16958..18458d8 100644 --- a/datastructures-json-minimal/build.gradle +++ b/datastructures-json-minimal/build.gradle @@ -1,5 +1,5 @@ dependencies { - testImplementation(libs.mockito.core) { + testImplementation(testLibs.mockito.core) { exclude group: 'org.hamcrest' } } diff --git a/datastructures-queue-tape/build.gradle b/datastructures-queue-tape/build.gradle index be1deb9..2dd94e1 100644 --- a/datastructures-queue-tape/build.gradle +++ b/datastructures-queue-tape/build.gradle @@ -1,9 +1,9 @@ dependencies { - testImplementation libs.junit4 - testImplementation libs.google.truth - testImplementation libs.burst.junit4 - testImplementation libs.okio - testRuntimeOnly libs.junit.vintage.engine + testImplementation testLibs.junit4 + testImplementation testLibs.google.truth + testImplementation testLibs.burst.junit4 + testImplementation testLibs.okio + testRuntimeOnly testLibs.junit.vintage.engine } test { diff --git a/datastructures-trie/build.gradle b/datastructures-trie/build.gradle index 5a16958..18458d8 100644 --- a/datastructures-trie/build.gradle +++ b/datastructures-trie/build.gradle @@ -1,5 +1,5 @@ dependencies { - testImplementation(libs.mockito.core) { + testImplementation(testLibs.mockito.core) { exclude group: 'org.hamcrest' } } diff --git a/datastructures-validation/build.gradle b/datastructures-validation/build.gradle index d4cf188..59e1c6d 100644 --- a/datastructures-validation/build.gradle +++ b/datastructures-validation/build.gradle @@ -1,4 +1,4 @@ dependencies { - testImplementation libs.assertj - testImplementation libs.compile.testing + testImplementation testLibs.assertj + testImplementation testLibs.compile.testing } diff --git a/gradle.properties b/gradle.properties index d9c5ca6..a97f3ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib name = datastructures -version = 5.0.5 +version = 5.0.6 org.gradle.warning.mode = all diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index d5f8960..2cdcf91 100644 --- a/gradle/test/junit5.gradle +++ b/gradle/test/junit5.gradle @@ -1,10 +1,10 @@ dependencies { - testImplementation libs.junit.jupiter.api - testImplementation libs.junit.jupiter.params - testImplementation libs.hamcrest - testRuntimeOnly libs.junit.jupiter.engine - testRuntimeOnly libs.junit.jupiter.platform.launcher + testImplementation testLibs.junit.jupiter.api + testImplementation testLibs.junit.jupiter.params + testImplementation testLibs.hamcrest + testRuntimeOnly testLibs.junit.jupiter.engine + testRuntimeOnly testLibs.junit.jupiter.platform.launcher } test { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8838ba9..e6aba25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index a32f661..eb31ba3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,6 +16,13 @@ dependencyResolutionManagement { versionCatalogs { libs { version('gradle', '8.4') + version('gradle', '8.5') + library('chronicle-core', 'net.openhft', 'chronicle-core').version('2.21ea14') + library('affinity', 'net.openhft', 'affinity').version('3.21ea0') + library('javassist', 'org.javassist', 'javassist').version('3.29.1-GA') + library('orgjson', 'org.json', 'json').version('20210307') + } + testLibs { version('junit', '5.10.0') version('jackson', '2.15.2') library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') @@ -25,20 +32,16 @@ dependencyResolutionManagement { library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0') 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('javassist', 'org.javassist', 'javassist').version('3.29.1-GA') + library('burst-junit4', 'com.squareup.burst', 'burst-junit4').version('1.1.1') + library('mockito-core', 'org.mockito', 'mockito-core').version('3.12.4') + library('google-truth', 'com.google.truth', 'truth').version('0.32') + 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('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson') library('jackson-annotations', 'com.fasterxml.jackson.core', 'jackson-annotations').versionRef('jackson') library('jackson-databind', '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('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') } } }