From cc0c69f46512e9d006e9623ebb4d98a05dc6a798 Mon Sep 17 00:00:00 2001 From: Reynold Morel Date: Wed, 23 Feb 2022 16:47:58 -0400 Subject: [PATCH] Updated bitcoinj version --- DONT-COMMIT-settings.gradle.sample | 34 ++++++++++++++++++++++++++++++ build.gradle | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 DONT-COMMIT-settings.gradle.sample diff --git a/DONT-COMMIT-settings.gradle.sample b/DONT-COMMIT-settings.gradle.sample new file mode 100644 index 000000000..c74678c83 --- /dev/null +++ b/DONT-COMMIT-settings.gradle.sample @@ -0,0 +1,34 @@ + +includeBuild('/Users/reynoldmorel/Documents/projects/rskj/') { + dependencySubstitution { + all { DependencySubstitution dependency -> + if (dependency.requested instanceof ModuleComponentSelector + && dependency.requested.group == 'co.rsk' + && dependency.requested.module == 'rskj-core' + && dependency.requested.version.endsWith('SNAPSHOT')) { + def targetProject = project(":${dependency.requested.module}") + if (targetProject != null) { + println('---- USING LOCAL ' + dependency.requested.displayName +' PROJECT ----') + dependency.useTarget targetProject + } + } + } + } +} + +includeBuild('/Users/reynoldmorel/Documents/projects/bitcoinj/') { + dependencySubstitution { + all { DependencySubstitution dependency -> + if (dependency.requested instanceof ModuleComponentSelector + && dependency.requested.group == 'org.bitcoinj' + && dependency.requested.module == 'core' + && dependency.requested.version.endsWith('rsk-3')) { + def targetProject = project(":${dependency.requested.module}") + if (targetProject != null) { + println('---- USING LOCAL ' + dependency.requested.displayName +' PROJECT ----') + dependency.useTarget targetProject + } + } + } + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0e7352ca1..e9ec6a2e3 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ tasks.withType(AbstractArchiveTask) { } ext { - bitcoinjcoreVersion = '0.15.6-rsk-2' + bitcoinjcoreVersion = '0.15.6-rsk-3' bitcoinjVersion = '0.14.4-rsk-11' commonsLang3Version = '3.5' commonsIoVersion = '2.5'