update to Gradle 8.5, use testLibs in version catalog for test dependencies

This commit is contained in:
Jörg Prante 2023-12-12 19:45:37 +01:00
parent bb11e558cc
commit 3432b46c7d
11 changed files with 36 additions and 33 deletions

View file

@ -1,3 +1,3 @@
dependencies { dependencies {
testImplementation libs.junit4 testImplementation testLibs.junit4
} }

View file

@ -3,10 +3,10 @@ apply from: rootProject.file('gradle/test/jmh.gradle')
dependencies { dependencies {
implementation libs.javassist implementation libs.javassist
testImplementation libs.junit4 testImplementation testLibs.junit4
testImplementation libs.jackson testImplementation testLibs.jackson
testImplementation libs.gson testImplementation testLibs.gson
jmhImplementation libs.gson jmhImplementation testLibs.gson
jmhImplementation libs.jackson.annotations jmhImplementation testLibs.jackson.annotations
jmhImplementation libs.jackson.databind jmhImplementation testLibs.jackson.databind
} }

View file

@ -1,5 +1,5 @@
dependencies { dependencies {
testImplementation(libs.mockito.core) { testImplementation(testLibs.mockito.core) {
exclude group: 'org.hamcrest' exclude group: 'org.hamcrest'
} }
} }

View file

@ -1,9 +1,9 @@
dependencies { dependencies {
testImplementation libs.junit4 testImplementation testLibs.junit4
testImplementation libs.google.truth testImplementation testLibs.google.truth
testImplementation libs.burst.junit4 testImplementation testLibs.burst.junit4
testImplementation libs.okio testImplementation testLibs.okio
testRuntimeOnly libs.junit.vintage.engine testRuntimeOnly testLibs.junit.vintage.engine
} }
test { test {

View file

@ -1,5 +1,5 @@
dependencies { dependencies {
testImplementation(libs.mockito.core) { testImplementation(testLibs.mockito.core) {
exclude group: 'org.hamcrest' exclude group: 'org.hamcrest'
} }
} }

View file

@ -1,4 +1,4 @@
dependencies { dependencies {
testImplementation libs.assertj testImplementation testLibs.assertj
testImplementation libs.compile.testing testImplementation testLibs.compile.testing
} }

View file

@ -1,5 +1,5 @@
group = org.xbib group = org.xbib
name = datastructures name = datastructures
version = 5.0.5 version = 5.0.6
org.gradle.warning.mode = all org.gradle.warning.mode = all

View file

@ -1,10 +1,10 @@
dependencies { dependencies {
testImplementation libs.junit.jupiter.api testImplementation testLibs.junit.jupiter.api
testImplementation libs.junit.jupiter.params testImplementation testLibs.junit.jupiter.params
testImplementation libs.hamcrest testImplementation testLibs.hamcrest
testRuntimeOnly libs.junit.jupiter.engine testRuntimeOnly testLibs.junit.jupiter.engine
testRuntimeOnly libs.junit.jupiter.platform.launcher testRuntimeOnly testLibs.junit.jupiter.platform.launcher
} }
test { test {

Binary file not shown.

View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

View file

@ -16,6 +16,13 @@ dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
libs { libs {
version('gradle', '8.4') 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('junit', '5.10.0')
version('jackson', '2.15.2') version('jackson', '2.15.2')
library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') 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('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0')
library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
library('junit4', 'junit', 'junit').version('4.13.2') library('junit4', 'junit', 'junit').version('4.13.2')
library('chronicle-core', 'net.openhft', 'chronicle-core').version('2.21ea14') library('burst-junit4', 'com.squareup.burst', 'burst-junit4').version('1.1.1')
library('affinity', 'net.openhft', 'affinity').version('3.21ea0') library('mockito-core', 'org.mockito', 'mockito-core').version('3.12.4')
library('javassist', 'org.javassist', 'javassist').version('3.29.1-GA') 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', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson')
library('jackson-annotations', 'com.fasterxml.jackson.core', 'jackson-annotations').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('jackson-databind', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson')
library('gson', 'com.google.code.gson', 'gson').version('2.8.9') 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')
} }
} }
} }