From c1c4caf87fbaf20f065691ef398d3fa0a31939f4 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Sun, 5 Feb 2023 22:02:13 +0100 Subject: [PATCH] Gradle: Apply bisq.java-conventions to all projects --- apitest/build.gradle | 3 +++ assets/build.gradle | 4 ++++ build.gradle | 17 ----------------- cli/build.gradle | 4 ++++ common/build.gradle | 3 +++ core/build.gradle | 3 +++ daemon/build.gradle | 4 ++++ desktop/build.gradle | 3 +++ p2p/build.gradle | 3 +++ proto/build.gradle | 4 ++++ seednode/build.gradle | 3 +++ statsnode/build.gradle | 3 +++ 12 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 apitest/build.gradle create mode 100644 common/build.gradle create mode 100644 core/build.gradle create mode 100644 desktop/build.gradle create mode 100644 p2p/build.gradle create mode 100644 seednode/build.gradle create mode 100644 statsnode/build.gradle diff --git a/apitest/build.gradle b/apitest/build.gradle new file mode 100644 index 0000000000..1a0dabb93c --- /dev/null +++ b/apitest/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'bisq.java-conventions' +} diff --git a/assets/build.gradle b/assets/build.gradle index 8eb6e8c7eb..46ca10b0ac 100644 --- a/assets/build.gradle +++ b/assets/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'bisq.java-conventions' +} + dependencies { implementation(libs.bitcoinj) { exclude(module: 'bcprov-jdk15on') diff --git a/build.gradle b/build.gradle index b2c9b84f8b..991580822a 100644 --- a/build.gradle +++ b/build.gradle @@ -23,12 +23,8 @@ configure(rootProject) { } configure(subprojects) { - apply plugin: 'java' apply plugin: 'com.google.osdetector' - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - ext { // in alphabetical order grpcVersion = '1.42.1' javafxVersion = '16' @@ -36,19 +32,6 @@ configure(subprojects) { os = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os } - - repositories { - mavenCentral() - maven { url 'https://jitpack.io' } - } - - dependencies { - testImplementation libs.junit - } - - tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' - } } diff --git a/cli/build.gradle b/cli/build.gradle index 7c8ffaee6f..96b0710c24 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'bisq.java-conventions' +} + distTar.enabled = true mainClassName = 'bisq.cli.CliMain' diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000000..1a0dabb93c --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'bisq.java-conventions' +} diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 0000000000..1a0dabb93c --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'bisq.java-conventions' +} diff --git a/daemon/build.gradle b/daemon/build.gradle index 5133827e1d..492e71c252 100644 --- a/daemon/build.gradle +++ b/daemon/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'bisq.java-conventions' +} + distTar.enabled = true mainClassName = 'bisq.daemon.app.BisqDaemonMain' diff --git a/desktop/build.gradle b/desktop/build.gradle new file mode 100644 index 0000000000..1a0dabb93c --- /dev/null +++ b/desktop/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'bisq.java-conventions' +} diff --git a/p2p/build.gradle b/p2p/build.gradle new file mode 100644 index 0000000000..1a0dabb93c --- /dev/null +++ b/p2p/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'bisq.java-conventions' +} diff --git a/proto/build.gradle b/proto/build.gradle index 4336f76d77..a52ad806fa 100644 --- a/proto/build.gradle +++ b/proto/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'bisq.java-conventions' +} + apply plugin: 'com.google.protobuf' dependencies { diff --git a/seednode/build.gradle b/seednode/build.gradle new file mode 100644 index 0000000000..1a0dabb93c --- /dev/null +++ b/seednode/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'bisq.java-conventions' +} diff --git a/statsnode/build.gradle b/statsnode/build.gradle new file mode 100644 index 0000000000..1a0dabb93c --- /dev/null +++ b/statsnode/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'bisq.java-conventions' +}