From 83b1e44d7d977130d6656f13561be8fd6563c7fa Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 7 Mar 2019 17:31:54 +0100 Subject: [PATCH] settings.gradle: Prefix project names by 'bitcoinj-'. --- core/build.gradle | 2 -- examples/build.gradle | 4 +--- settings.gradle | 8 ++++++++ tools/build.gradle | 4 +--- wallettemplate/build.gradle | 4 +--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index ec9dab925..fdffcfabf 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -4,8 +4,6 @@ apply plugin: 'maven' apply plugin: 'eclipse' version = '0.16-SNAPSHOT' -archivesBaseName = 'bitcoinj-core' -eclipse.project.name = 'bitcoinj-core' dependencies { compile 'org.bouncycastle:bcprov-jdk15on:1.60' diff --git a/examples/build.gradle b/examples/build.gradle index 5c1b1a0df..33df8e9b0 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -1,10 +1,8 @@ apply plugin: 'java' apply plugin: 'eclipse' -eclipse.project.name = 'bitcoinj-examples' - dependencies { - implementation project(':core') + implementation project(':bitcoinj-core') implementation 'com.google.guava:guava:27.0.1-android' implementation 'net.sf.jopt-simple:jopt-simple:5.0.4' implementation 'org.slf4j:slf4j-jdk14:1.7.25' diff --git a/settings.gradle b/settings.gradle index 7fb0bdfab..5b0ed6960 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,21 @@ import org.gradle.util.GradleVersion +rootProject.name = 'bitcoinj-parent' + include 'core' +project(':core').name = 'bitcoinj-core' + include 'tools' +project(':tools').name = 'bitcoinj-tools' + include 'examples' +project(':examples').name = 'bitcoinj-examples' def minGradleVersion = GradleVersion.version("4.10") if (GradleVersion.current().compareTo(minGradleVersion) >= 0 && JavaVersion.current().isJava11Compatible()) { println "Including wallettemplate because ${GradleVersion.current()} and Java ${JavaVersion.current()}" include 'wallettemplate' + project(':wallettemplate').name = 'bitcoinj-wallettemplate' } else { println "Skipping wallettemplate: ${GradleVersion.current()} and Java ${JavaVersion.current()}" } diff --git a/tools/build.gradle b/tools/build.gradle index 9a78bfde6..9c14fa3db 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -1,10 +1,8 @@ apply plugin: 'java' apply plugin: 'eclipse' -eclipse.project.name = 'bitcoinj-tools' - dependencies { - implementation project(':core') + implementation project(':bitcoinj-core') implementation 'com.google.guava:guava:27.0.1-android' implementation 'net.sf.jopt-simple:jopt-simple:5.0.4' implementation 'org.slf4j:slf4j-jdk14:1.7.25' diff --git a/wallettemplate/build.gradle b/wallettemplate/build.gradle index 9e0fe15d2..58ace56ff 100644 --- a/wallettemplate/build.gradle +++ b/wallettemplate/build.gradle @@ -7,10 +7,8 @@ apply plugin: 'eclipse' apply plugin: 'application' apply plugin: 'org.openjfx.javafxplugin' -eclipse.project.name = 'bitcoinj-wallettemplate' - dependencies { - implementation project(':core') + implementation project(':bitcoinj-core') implementation 'com.google.guava:guava:27.0.1-android' implementation 'org.fxmisc.easybind:easybind:1.0.2' implementation 'de.jensd:fontawesomefx:8.0.0'