From 80b10c88f619ae60577609472dd65f70ce5afbaa Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Wed, 7 Dec 2022 00:26:41 +0100 Subject: [PATCH 1/2] Update to Gradle 7.6 --- gradle/verification-metadata.xml | 33 +++++++++++++++++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 72546879334..b02f9745b45 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -43,16 +43,16 @@ - - - - - + + + + + @@ -881,6 +881,11 @@ + + + + + @@ -889,6 +894,14 @@ + + + + + + + + @@ -897,6 +910,14 @@ + + + + + + + + @@ -1089,8 +1110,6 @@ - - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 669386b870a..070cb702f09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From de600ddb30f56a3042e1a2c9337d5a611603a3e3 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Fri, 9 Dec 2022 14:45:26 +0100 Subject: [PATCH 2/2] Introduce Gradle Version Catalog To simplify the build.gradle file, this change moves all version variables to Gradle's version catalog. --- build.gradle | 394 +++++++++++++++++--------------------- gradle/libs.versions.toml | 110 +++++++++++ 2 files changed, 289 insertions(+), 215 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/build.gradle b/build.gradle index 04ed710ad26..41080c989ee 100644 --- a/build.gradle +++ b/build.gradle @@ -30,46 +30,9 @@ configure(subprojects) { targetCompatibility = JavaVersion.VERSION_11 ext { // in alphabetical order - bcVersion = '1.63' - bitcoinjVersion = '42bbae9' - codecVersion = '1.13' - cowwocVersion = '1.2' - easybindVersion = '1.0.3' - easyVersion = '4.0.1' - findbugsVersion = '3.0.2' - fontawesomefxVersion = '8.0.0' - fontawesomefxCommonsVersion = '9.1.2' - fontawesomefxMaterialdesignfontVersion = '2.0.26-9.1.2' grpcVersion = '1.42.1' - gsonVersion = '2.8.5' - guavaVersion = '30.1.1-jre' - guiceVersion = '5.0.1' - hamcrestVersion = '1.3' - httpclientVersion = '4.5.12' - httpcoreVersion = '4.4.13' - ioVersion = '2.6' - jacksonVersion = '2.12.1' javafxVersion = '16' - javaxAnnotationVersion = '1.2' - jcsvVersion = '1.4.0' - jetbrainsAnnotationsVersion = '13.0' - jfoenixVersion = '9.0.10' - joptVersion = '5.0.4' - jsonsimpleVersion = '1.1.1' - jsonrpc4jVersion = '1.6.0.bisq.1' - junitVersion = '4.12' - jupiterVersion = '5.7.0' - kotlinVersion = '1.3.41' - langVersion = '3.11' - logbackVersion = '1.1.11' - loggingVersion = '1.2' - lombokVersion = '1.18.22' - mockitoVersion = '4.0.0' - netlayerVersion = '0.7.5' - protobufVersion = '3.19.1' - protocVersion = protobufVersion - qrgenVersion = '1.3' - slf4jVersion = '1.7.30' + protocVersion = '3.19.1' os = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os } @@ -80,7 +43,7 @@ configure(subprojects) { } dependencies { - testImplementation "junit:junit:$junitVersion" + testImplementation libs.junit } tasks.withType(JavaCompile) { @@ -168,19 +131,19 @@ configure(project(':proto')) { apply plugin: 'com.google.protobuf' dependencies { - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "javax.annotation:javax.annotation-api:$javaxAnnotationVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "ch.qos.logback:logback-classic:$logbackVersion" - implementation "ch.qos.logback:logback-core:$logbackVersion" - implementation "com.google.guava:guava:$guavaVersion" - implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("io.grpc:grpc-protobuf:$grpcVersion") { + annotationProcessor libs.lombok + compileOnly libs.javax.annotation + compileOnly libs.lombok + implementation libs.logback.classic + implementation libs.logback.core + implementation libs.google.guava + implementation libs.protobuf.java + implementation libs.slf4j.api + implementation(libs.grpc.protobuf) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } - implementation("io.grpc:grpc-stub:$grpcVersion") { + implementation(libs.grpc.stub) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } @@ -208,7 +171,7 @@ configure(project(':proto')) { configure(project(':assets')) { dependencies { - implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { + implementation(libs.bitcoinj) { exclude(module: 'bcprov-jdk15on') exclude(module: 'guava') exclude(module: 'jsr305') @@ -217,9 +180,9 @@ configure(project(':assets')) { exclude(module: 'protobuf-java') exclude(module: 'slf4j-api') } - implementation "com.google.guava:guava:$guavaVersion" - implementation "org.apache.commons:commons-lang3:$langVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation libs.google.guava + implementation libs.apache.commons.lang3 + implementation libs.slf4j.api } } @@ -243,12 +206,12 @@ configure(project(':common')) { dependencies { implementation project(':proto') - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "javax.annotation:javax.annotation-api:$javaxAnnotationVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "ch.qos.logback:logback-classic:$logbackVersion" - implementation "ch.qos.logback:logback-core:$logbackVersion" - implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { + annotationProcessor libs.lombok + compileOnly libs.javax.annotation + compileOnly libs.lombok + implementation libs.logback.classic + implementation libs.logback.core + implementation(libs.bitcoinj) { exclude(module: 'bcprov-jdk15on') exclude(module: 'guava') exclude(module: 'jsr305') @@ -257,22 +220,22 @@ configure(project(':common')) { exclude(module: 'protobuf-java') exclude(module: 'slf4j-api') } - implementation "com.google.code.findbugs:jsr305:$findbugsVersion" - implementation "com.google.code.gson:gson:$gsonVersion" - implementation "com.google.guava:guava:$guavaVersion" - implementation("com.google.inject:guice:$guiceVersion") { + implementation libs.google.findbugs + implementation libs.google.gson + implementation libs.google.guava + implementation(libs.google.guice) { exclude(module: 'guava') } - implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "commons-io:commons-io:$ioVersion" - implementation "net.sf.jopt-simple:jopt-simple:$joptVersion" - implementation "org.apache.commons:commons-lang3:$langVersion" - implementation "org.bouncycastle:bcpg-jdk15on:$bcVersion" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" - implementation "org.jetbrains:annotations:$jetbrainsAnnotationsVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - testImplementation "org.hamcrest:hamcrest-all:$hamcrestVersion" - runtimeOnly("io.grpc:grpc-netty-shaded:$grpcVersion") { + implementation libs.protobuf.java + implementation libs.commons.io + implementation libs.jopt + implementation libs.apache.commons.lang3 + implementation libs.bouncycastle.bcpg.jdk15on + implementation libs.kotlin.stdlib.jdk8 + implementation libs.jetbrains.annotations + implementation libs.slf4j.api + testImplementation libs.hamcrest + runtimeOnly(libs.grpc.netty.shaded) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } @@ -291,19 +254,19 @@ configure(project(':p2p')) { dependencies { implementation project(':proto') implementation project(':common') - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "com.google.guava:guava:$guavaVersion" - implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "org.fxmisc.easybind:easybind:$easybindVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("com.github.bisq-network.netlayer:tor.external:$netlayerVersion") { + annotationProcessor libs.lombok + compileOnly libs.lombok + implementation libs.google.guava + implementation libs.protobuf.java + implementation libs.fxmisc.easybind + implementation libs.slf4j.api + implementation(libs.netlayer.tor.external) { exclude(module: 'slf4j-api') } - implementation("com.github.bisq-network.netlayer:tor.native:$netlayerVersion") { + implementation(libs.netlayer.tor.native) { exclude(module: 'slf4j-api') } - implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { + implementation(libs.bitcoinj) { exclude(module: 'bcprov-jdk15on') exclude(module: 'guava') exclude(module: 'jsr305') @@ -312,18 +275,18 @@ configure(project(':p2p')) { exclude(module: 'protobuf-java') exclude(module: 'slf4j-api') } - implementation("com.google.inject:guice:$guiceVersion") { + implementation(libs.google.guice) { exclude(module: 'guava') } - implementation("org.apache.httpcomponents:httpclient:$httpclientVersion") { + implementation(libs.apache.httpclient) { exclude(module: 'commons-codec') } - testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion" - testCompileOnly "org.projectlombok:lombok:$lombokVersion" - testImplementation "ch.qos.logback:logback-classic:$logbackVersion" - testImplementation "ch.qos.logback:logback-core:$logbackVersion" - testImplementation "org.apache.commons:commons-lang3:$langVersion" - testImplementation("org.mockito:mockito-core:$mockitoVersion") + testAnnotationProcessor libs.lombok + testCompileOnly libs.lombok + testImplementation libs.logback.classic + testImplementation libs.logback.core + testImplementation libs.apache.commons.lang3 + testImplementation libs.mockito } } @@ -341,35 +304,35 @@ configure(project(':core')) { implementation project(':assets') implementation project(':common') implementation project(':p2p') - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "javax.annotation:javax.annotation-api:$javaxAnnotationVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "ch.qos.logback:logback-classic:$logbackVersion" - implementation "ch.qos.logback:logback-core:$logbackVersion" - implementation "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion" - implementation "com.fasterxml.jackson.core:jackson-core:$jacksonVersion" - implementation "com.google.code.findbugs:jsr305:$findbugsVersion" - implementation "com.google.code.gson:gson:$gsonVersion" - implementation "com.google.guava:guava:$guavaVersion" - implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "commons-codec:commons-codec:$codecVersion" - implementation "commons-io:commons-io:$ioVersion" - implementation "net.sf.jopt-simple:jopt-simple:$joptVersion" - implementation "org.apache.commons:commons-lang3:$langVersion" - implementation "org.apache.httpcomponents:httpcore:$httpcoreVersion" - implementation "org.fxmisc.easybind:easybind:$easybindVersion" - implementation "org.jetbrains:annotations:$jetbrainsAnnotationsVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") { + annotationProcessor libs.lombok + compileOnly libs.javax.annotation + compileOnly libs.lombok + implementation libs.logback.classic + implementation libs.logback.core + implementation libs.jackson.annotations + implementation libs.jackson.core + implementation libs.google.findbugs + implementation libs.google.gson + implementation libs.google.guava + implementation libs.protobuf.java + implementation libs.commons.codec + implementation libs.commons.io + implementation libs.jopt + implementation libs.apache.commons.lang3 + implementation libs.apache.httpcore + implementation libs.fxmisc.easybind + implementation libs.jetbrains.annotations + implementation libs.slf4j.api + implementation(libs.jackson.databind) { exclude(module: 'jackson-annotations') } - implementation("com.github.bisq-network.netlayer:tor.external:$netlayerVersion") { + implementation(libs.netlayer.tor.external) { exclude(module: 'slf4j-api') } - implementation("com.github.bisq-network.netlayer:tor.native:$netlayerVersion") { + implementation(libs.netlayer.tor.native) { exclude(module: 'slf4j-api') } - implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { + implementation(libs.bitcoinj) { exclude(module: 'bcprov-jdk15on') exclude(module: 'guava') exclude(module: 'jsr305') @@ -378,21 +341,21 @@ configure(project(':core')) { exclude(module: 'protobuf-java') exclude(module: 'slf4j-api') } - implementation("com.github.bisq-network:jsonrpc4j:$jsonrpc4jVersion") { + implementation(libs.jsonrpc4j) { exclude(module: 'base64') exclude(module: 'httpcore-nio') } - implementation("com.google.inject:guice:$guiceVersion") { + implementation(libs.google.guice) { exclude(module: 'guava') } - implementation("org.apache.httpcomponents:httpclient:$httpclientVersion") { + implementation(libs.apache.httpclient) { exclude(module: 'commons-codec') } - testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion" - testCompileOnly "org.projectlombok:lombok:$lombokVersion" - testImplementation "com.natpryce:make-it-easy:$easyVersion" - testImplementation "org.hamcrest:hamcrest-all:$hamcrestVersion" - testImplementation "org.mockito:mockito-core:$mockitoVersion" + testAnnotationProcessor libs.lombok + testCompileOnly libs.lombok + testImplementation libs.natpryce.make.it.easy + testImplementation libs.hamcrest + testImplementation libs.mockito } test { @@ -405,33 +368,34 @@ configure(project(':cli')) { dependencies { implementation project(':proto') - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "ch.qos.logback:logback-classic:$logbackVersion" - implementation "ch.qos.logback:logback-core:$logbackVersion" - implementation "com.google.guava:guava:$guavaVersion" - implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "net.sf.jopt-simple:jopt-simple:$joptVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("io.grpc:grpc-core:$grpcVersion") { + annotationProcessor libs.lombok + compileOnly libs.lombok + implementation libs.logback.classic + implementation libs.logback.core + implementation libs.google.guava + implementation libs.protobuf.java + implementation libs.jopt + implementation libs.slf4j.api + implementation(libs.grpc.core) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } - implementation("io.grpc:grpc-stub:$grpcVersion") { + implementation(libs.grpc.stub) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } - runtimeOnly("io.grpc:grpc-netty-shaded:$grpcVersion") { + runtimeOnly(libs.grpc.netty.shaded) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } - testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion" - testCompileOnly "org.projectlombok:lombok:$lombokVersion" - testImplementation "org.bitbucket.cowwoc:diff-match-patch:$cowwocVersion" - testImplementation "org.junit.jupiter:junit-jupiter-api:$jupiterVersion" - testImplementation "org.junit.jupiter:junit-jupiter-params:$jupiterVersion" - testRuntimeOnly "javax.annotation:javax.annotation-api:$javaxAnnotationVersion" - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion") + testAnnotationProcessor libs.lombok + testCompileOnly libs.lombok + testImplementation libs.cowwoc.diff.match.patch + + testImplementation libs.junit.jupiter.api + testImplementation libs.junit.jupiter.params + testRuntimeOnly libs.javax.annotation + testRuntimeOnly libs.junit.jupiter.engine } test { @@ -470,26 +434,26 @@ configure(project(':desktop')) { implementation project(':proto') implementation project(':p2p') implementation project(':core') - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "ch.qos.logback:logback-classic:$logbackVersion" - implementation "ch.qos.logback:logback-core:$logbackVersion" - implementation "com.google.code.gson:gson:$gsonVersion" - implementation "com.google.guava:guava:$guavaVersion" - implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "com.googlecode.jcsv:jcsv:$jcsvVersion" - implementation "com.jfoenix:jfoenix:$jfoenixVersion" - implementation "commons-io:commons-io:$ioVersion" - implementation "de.jensd:fontawesomefx-commons:$fontawesomefxCommonsVersion" - implementation "de.jensd:fontawesomefx-materialdesignfont:$fontawesomefxMaterialdesignfontVersion" - implementation "de.jensd:fontawesomefx:$fontawesomefxVersion" - implementation "net.glxn:qrgen:$qrgenVersion" - implementation "org.apache.commons:commons-lang3:$langVersion" - implementation "org.bouncycastle:bcpg-jdk15on:$bcVersion" - implementation "org.fxmisc.easybind:easybind:$easybindVersion" - implementation "org.jetbrains:annotations:$jetbrainsAnnotationsVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { + annotationProcessor libs.lombok + compileOnly libs.lombok + implementation libs.logback.classic + implementation libs.logback.core + implementation libs.google.gson + implementation libs.google.guava + implementation libs.protobuf.java + implementation libs.jcsv + implementation libs.jfoenix + implementation libs.commons.io + implementation libs.fontawesomefx + implementation libs.fontawesomefx.commons + implementation libs.fontawesomefx.materialdesign.font + implementation libs.qrgen + implementation libs.apache.commons.lang3 + implementation libs.bouncycastle.bcpg.jdk15on + implementation libs.fxmisc.easybind + implementation libs.jetbrains.annotations + implementation libs.slf4j.api + implementation(libs.bitcoinj) { exclude(module: 'bcprov-jdk15on') exclude(module: 'guava') exclude(module: 'jsr305') @@ -498,13 +462,13 @@ configure(project(':desktop')) { exclude(module: 'protobuf-java') exclude(module: 'slf4j-api') } - implementation("com.google.inject:guice:$guiceVersion") { + implementation(libs.google.guice) { exclude(module: 'guava') } - testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion" - testCompileOnly "org.projectlombok:lombok:$lombokVersion" - testImplementation "com.natpryce:make-it-easy:$easyVersion" - testImplementation "org.mockito:mockito-core:$mockitoVersion" + testAnnotationProcessor libs.lombok + testCompileOnly libs.lombok + testImplementation libs.natpryce.make.it.easy + testImplementation libs.mockito } test { @@ -522,14 +486,14 @@ configure(project(':seednode')) { implementation project(':common') implementation project(':p2p') implementation project(':core') - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "com.google.guava:guava:$guavaVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("com.google.inject:guice:$guiceVersion") { + annotationProcessor libs.lombok + compileOnly libs.lombok + implementation libs.google.guava + implementation libs.slf4j.api + implementation(libs.google.guice) { exclude(module: 'guava') } - testImplementation "org.mockito:mockito-core:$mockitoVersion" + testImplementation libs.mockito } } @@ -540,10 +504,10 @@ configure(project(':statsnode')) { implementation project(':common') implementation project(':p2p') implementation project(':core') - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("com.google.inject:guice:$guiceVersion") { + annotationProcessor libs.lombok + compileOnly libs.lombok + implementation libs.slf4j.api + implementation(libs.google.guice) { exclude(module: 'guava') } } @@ -557,18 +521,18 @@ configure(project(':daemon')) { implementation project(':common') implementation project(':p2p') implementation project(':core') - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "javax.annotation:javax.annotation-api:$javaxAnnotationVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "ch.qos.logback:logback-classic:$logbackVersion" - implementation "ch.qos.logback:logback-core:$logbackVersion" - implementation "com.google.code.gson:gson:$gsonVersion" - implementation "com.google.guava:guava:$guavaVersion" - implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "org.apache.commons:commons-lang3:$langVersion" - implementation "org.jetbrains:annotations:$jetbrainsAnnotationsVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { + annotationProcessor libs.lombok + compileOnly libs.javax.annotation + compileOnly libs.lombok + implementation libs.logback.classic + implementation libs.logback.core + implementation libs.google.gson + implementation libs.google.guava + implementation libs.protobuf.java + implementation libs.apache.commons.lang3 + implementation libs.jetbrains.annotations + implementation libs.slf4j.api + implementation(libs.bitcoinj) { exclude(module: 'bcprov-jdk15on') exclude(module: 'guava') exclude(module: 'jsr305') @@ -577,26 +541,26 @@ configure(project(':daemon')) { exclude(module: 'protobuf-java') exclude(module: 'slf4j-api') } - implementation("com.google.inject:guice:$guiceVersion") { + implementation(libs.google.guice) { exclude(module: 'guava') } - implementation("io.grpc:grpc-protobuf:$grpcVersion") { + implementation(libs.grpc.protobuf) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } - implementation("io.grpc:grpc-stub:$grpcVersion") { + implementation(libs.grpc.stub) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } - runtimeOnly("io.grpc:grpc-netty-shaded:$grpcVersion") { + runtimeOnly(libs.grpc.netty.shaded) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } - testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion" - testCompileOnly "org.projectlombok:lombok:$lombokVersion" - testImplementation "org.junit.jupiter:junit-jupiter-api:$jupiterVersion" - testImplementation "org.junit.jupiter:junit-jupiter-params:$jupiterVersion" - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion") + testAnnotationProcessor libs.lombok + testCompileOnly libs.lombok + testImplementation libs.junit.jupiter.api + testImplementation libs.junit.jupiter.params + testRuntimeOnly(libs.junit.jupiter.engine) } } @@ -669,18 +633,18 @@ configure(project(':apitest')) { implementation project(':desktop') implementation project(':daemon') implementation project(':cli') - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "javax.annotation:javax.annotation-api:$javaxAnnotationVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" - implementation "ch.qos.logback:logback-classic:$logbackVersion" - implementation "ch.qos.logback:logback-core:$logbackVersion" - implementation "com.google.code.gson:gson:$gsonVersion" - implementation "com.google.guava:guava:$guavaVersion" - implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "net.sf.jopt-simple:jopt-simple:$joptVersion" - implementation "org.apache.commons:commons-lang3:$langVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { + annotationProcessor libs.lombok + compileOnly libs.javax.annotation + compileOnly libs.lombok + implementation libs.logback.classic + implementation libs.logback.core + implementation libs.google.gson + implementation libs.google.guava + implementation libs.protobuf.java + implementation libs.jopt + implementation libs.apache.commons.lang3 + implementation libs.slf4j.api + implementation(libs.bitcoinj) { exclude(module: 'bcprov-jdk15on') exclude(module: 'guava') exclude(module: 'jsr305') @@ -689,19 +653,19 @@ configure(project(':apitest')) { exclude(module: 'protobuf-java') exclude(module: 'slf4j-api') } - implementation("io.grpc:grpc-protobuf:$grpcVersion") { + implementation(libs.grpc.protobuf) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } - implementation("io.grpc:grpc-stub:$grpcVersion") { + implementation(libs.grpc.stub) { exclude(module: 'animal-sniffer-annotations') exclude(module: 'guava') } - testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion" - testCompileOnly "org.projectlombok:lombok:$lombokVersion" - testImplementation "org.junit.jupiter:junit-jupiter-api:$jupiterVersion" - testImplementation "org.junit.jupiter:junit-jupiter-params:$jupiterVersion" - testRuntimeOnly "javax.annotation:javax.annotation-api:$javaxAnnotationVersion" - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion") + testAnnotationProcessor libs.lombok + testCompileOnly libs.lombok + testImplementation libs.junit.jupiter.api + testImplementation libs.junit.jupiter.params + testRuntimeOnly libs.javax.annotation + testRuntimeOnly(libs.junit.jupiter.engine) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000000..0ce4dd4f95e --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,110 @@ +[versions] +apache-commons-lang3 = { strictly = '3.11' } +apache-httpclient = { strictly = '4.5.12' } +apache-httpcore = { strictly = '4.4.13' } + +bitcoinj = { strictly = '42bbae9' } +bouncycastle = { strictly = '1.63' } + +commons-codec = { strictly = '1.13' } +commons-io = { strictly = '2.6' } + +cowwoc-diff-match-patch = { strictly = '1.2' } + +fontawesomefx = { strictly = '8.0.0' } +fontawesomefx-commons = { strictly = '9.1.2' } +fontawesomefx-materialdesign-font = { strictly = '2.0.26-9.1.2' } + +fxmisc-easybind = { strictly = '1.0.3' } + +google-findbugs = { strictly = '3.0.2' } +google-gson = { strictly = '2.8.5' } +google-guava = { strictly = '30.1.1-jre' } +google-guice = { strictly = '5.0.1' } + +grpc = { strictly = '1.42.1' } +hamcrest = { strictly = '1.3' } + +jackson = { strictly = '2.12.1' } +javax-annotation = { strictly = '1.2' } +jcsv = { strictly = '1.4.0' } +jetbrains-annotations = { strictly = '13.0' } +jfoenix = { strictly = '9.0.10' } +jopt = { strictly = '5.0.4' } +jsonrpc4j = { strictly = '1.6.0.bisq.1' } + +junit = { strictly = '4.12' } +junit-jupiter = { strictly = '5.7.0' } + +kotlin = { strictly = '1.3.41' } +logback = { strictly = '1.1.11' } +lombok = { strictly = '1.18.22' } +mockito = { strictly = '4.0.0' } +natpryce-make-it-easy = { strictly = '4.0.1' } +netlayer = { strictly = '0.7.5' } +protobuf = { strictly = '3.19.1' } +qrgen = { strictly = '1.3' } +slf4j = { strictly = '1.7.30' } + +[libraries] +apache-httpclient = { module = "org.apache.httpcomponents:httpclient", version.ref = "apache-httpclient" } +apache-httpcore = { module = "org.apache.httpcomponents:httpcore", version.ref = "apache-httpcore" } +apache-commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "apache-commons-lang3" } + +bitcoinj = { module = "com.github.bisq-network:bitcoinj", version.ref = "bitcoinj" } +bouncycastle-bcpg-jdk15on = { module = "org.bouncycastle:bcpg-jdk15on", version.ref = "bouncycastle" } + +commons-codec = { module = "commons-codec:commons-codec", version.ref = "commons-codec" } +commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" } + +cowwoc-diff-match-patch = { module = "org.bitbucket.cowwoc:diff-match-patch", version.ref = "cowwoc-diff-match-patch" } + +fontawesomefx = { module = "de.jensd:fontawesomefx", version.ref = "fontawesomefx" } +fontawesomefx-commons = { module = "de.jensd:fontawesomefx-commons", version.ref = "fontawesomefx-commons" } +fontawesomefx-materialdesign-font = { module = "de.jensd:fontawesomefx-materialdesignfont", version.ref = "fontawesomefx-materialdesign-font" } + +fxmisc-easybind = { module = "org.fxmisc.easybind:easybind", version.ref = "fxmisc-easybind" } + +google-findbugs = { module = "com.google.code.findbugs:jsr305", version.ref = "google-findbugs" } +google-gson = { module = "com.google.code.gson:gson", version.ref = "google-gson" } +google-guava = { module = "com.google.guava:guava", version.ref = "google-guava" } +google-guice = { module = "com.google.inject:guice", version.ref = "google-guice" } + +grpc-core = { module = "io.grpc:grpc-core", version.ref = "grpc" } +grpc-netty-shaded = { module = "io.grpc:grpc-netty-shaded", version.ref = "grpc" } +grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" } +grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" } + +hamcrest = { module = "org.hamcrest:hamcrest-all", version.ref = "hamcrest" } + +jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" } +jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" } +jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } + +javax-annotation = { module = "javax.annotation:javax.annotation-api", version.ref = "javax-annotation" } +jcsv = { module = "com.googlecode.jcsv:jcsv", version.ref = "jcsv" } +jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" } +jfoenix = { module = "com.jfoenix:jfoenix", version.ref = "jfoenix" } +jopt = { module = "net.sf.jopt-simple:jopt-simple", version.ref = "jopt" } +jsonrpc4j = { module = "com.github.bisq-network:jsonrpc4j", version.ref = "jsonrpc4j" } + +junit = { module = "junit:junit", version.ref = "junit" } +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" } +junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" } + +kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } + +logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" } +logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } + +lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" } +mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" } +natpryce-make-it-easy = { module = "com.natpryce:make-it-easy", version.ref = "natpryce-make-it-easy" } + +netlayer-tor-external = { module = "com.github.bisq-network.netlayer:tor.external", version.ref = "netlayer" } +netlayer-tor-native = { module = "com.github.bisq-network.netlayer:tor.native", version.ref = "netlayer" } + +protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" } +qrgen = { module = "net.glxn:qrgen", version.ref = "qrgen" } +slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }