update to gradle 4.7.2

This commit is contained in:
Jörg Prante 2022-07-29 08:49:45 +02:00
parent 0ea9f1c034
commit fbca132aeb
7 changed files with 51 additions and 23 deletions

View file

@ -4,7 +4,7 @@ plugins {
} }
wrapper { wrapper {
gradleVersion = "${project.property('gradle.wrapper.version')}" gradleVersion = libs.versions.gradle.get()
distributionType = Wrapper.DistributionType.ALL distributionType = Wrapper.DistributionType.ALL
} }
ext { ext {
@ -31,10 +31,10 @@ apply from: rootProject.file('gradle/publishing/publication.gradle')
apply from: rootProject.file('gradle/publishing/sonatype.gradle') apply from: rootProject.file('gradle/publishing/sonatype.gradle')
dependencies { dependencies {
api "org.xbib:settings-api:${project.property('xbib-content.version')}" api libs.settings.api
implementation "org.xbib:guava:${project.property('xbib-guava.version')}" implementation libs.guava
implementation "org.xbib:time:${project.property('xbib-time.version')}" implementation libs.time
implementation "org.xbib:datastructures-json-tiny:${project.property('xbib-datastructures.version')}" implementation libs.datastructures.json.tiny
implementation "org.reactivestreams:reactive-streams:${project.property('reactivestreams.version')}" implementation libs.reactivestreams
testImplementation "io.reactivex.rxjava3:rxjava:${project.property('rxjava3.version')}" testImplementation libs.rxjava3
} }

View file

@ -3,10 +3,3 @@ name = event
version = 0.0.1 version = 0.0.1
org.gradle.warning.mode = ALL org.gradle.warning.mode = ALL
gradle.wrapper.version = 7.3.2
xbib-guava.version = 30.1
xbib-content.version = 4.0.0
xbib-time.version = 2.1.1
xbib-datastructures.version = 1.0.0
reactivestreams.version = 1.0.3
rxjava3.version = 3.0.3

View file

@ -1,12 +1,8 @@
def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.6.2'
def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
dependencies { 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 { test {

Binary file not shown.

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -0,0 +1,19 @@
dependencyResolutionManagement {
versionCatalogs {
libs {
version('gradle', '7.4.2')
version('junit', '5.8.2')
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('junit4', 'junit', 'junit').version('4.13.2')
library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
library('settings-api', 'org.xbib', 'settings-api').version('4.0.0')
library('guava', 'org.xbib', 'guava').version('30.1')
library('time', 'org.xbib', 'time').version('2.1.1')
library('datastructures-json-tiny', 'org.xbib', 'datastructures-json-tiny').version('1.0.0')
library('reactivestreams', 'org.reactivestreams', 'reactive-streams').version('1.0.3')
library('rxjava3', 'io.reactivex.rxjava3', 'rxjava').version('3.0.3')
}
}
}

View file

@ -0,0 +1,20 @@
module org.xbib.event {
exports org.xbib.event;
exports org.xbib.event.async;
exports org.xbib.event.clock;
exports org.xbib.event.persistence;
exports org.xbib.event.queue;
exports org.xbib.event.queue.path.simple;
exports org.xbib.event.queue.path.watch;
exports org.xbib.event.timer;
exports org.xbib.event.yield;
exports org.xbib.event.yield.async;
exports org.xbib.event.yield.boxes;
exports org.xbib.event.yield.ops;
requires org.xbib.guava;
requires org.xbib.settings.api;
requires org.xbib.time;
requires org.xbib.datastructures.json.tiny;
requires org.reactivestreams;
requires java.logging;
}