update to gradle 7.4.2

This commit is contained in:
Jörg Prante 2022-06-01 10:09:09 +02:00
parent 7ce409d544
commit 50b94ef8b2
15 changed files with 71 additions and 53 deletions

View file

@ -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 "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
implementation "org.json:json:${project.property('orgjson.version')}"
implementation libs.gson
implementation libs.jackson.databind
implementation libs.orgjson
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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

View file

@ -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 "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
testImplementation libs.junit.jupiter.api
testImplementation libs.junit.jupiter.params
testImplementation libs.hamcrest
testRuntimeOnly libs.junit.jupiter.engine
}
test {

Binary file not shown.

View file

@ -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

View file

@ -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'