From 2f7c5f115080147db3bc013efd5e21f339ca13b8 Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Sun, 4 Nov 2018 17:46:03 +0100
Subject: [PATCH] Pull up remaining p2p config to root

---
 build.gradle     | 20 ++++++++++++++++++++
 p2p/build.gradle | 17 -----------------
 2 files changed, 20 insertions(+), 17 deletions(-)
 delete mode 100644 p2p/build.gradle

diff --git a/build.gradle b/build.gradle
index 9be8e3acc5..116f2566bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,6 +108,26 @@ configure(project(':common')) {
     }
 }
 
+configure(project(':p2p')) {
+    dependencies {
+        compile project(':common')
+        compile('com.github.JesusMcCloud.netlayer:tor.native:0.4.2') {
+            exclude(module: 'slf4j-api')
+        }
+        compile('org.apache.httpcomponents:httpclient:4.5.3') {
+            exclude(module: 'commons-logging')
+        }
+        compile 'net.sf.jopt-simple:jopt-simple:5.0.3'
+        compile 'org.fxmisc.easybind:easybind:1.0.3'
+        compileOnly 'org.projectlombok:lombok:1.18.2'
+        annotationProcessor 'org.projectlombok:lombok:1.18.2'
+        testCompile 'junit:junit:4.12'
+        testCompile 'org.jmockit:jmockit:1.30'
+        testCompileOnly 'org.projectlombok:lombok:1.18.2'
+        testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
+    }
+}
+
 configure(project(':core')) {
     dependencies {
         compile project(':assets')
diff --git a/p2p/build.gradle b/p2p/build.gradle
deleted file mode 100644
index e67ebc543d..0000000000
--- a/p2p/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-dependencies {
-    compile project(':common')
-    compile('com.github.JesusMcCloud.netlayer:tor.native:0.4.2') {
-        exclude(module: 'slf4j-api')
-    }
-    compile('org.apache.httpcomponents:httpclient:4.5.3') {
-        exclude(module: 'commons-logging')
-    }
-    compile 'net.sf.jopt-simple:jopt-simple:5.0.3'
-    compile 'org.fxmisc.easybind:easybind:1.0.3'
-    compileOnly 'org.projectlombok:lombok:1.18.2'
-    annotationProcessor 'org.projectlombok:lombok:1.18.2'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.jmockit:jmockit:1.30'
-    testCompileOnly 'org.projectlombok:lombok:1.18.2'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
-}