From 9be53ecb43a8b5f658d67f85d09ca4181db48f19 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 27 Nov 2017 15:36:09 +0000
Subject: [PATCH] Swap out getopt, gettext, and geoip code in Gradle libs for
dependencies
---
apps/i2psnark/build.gradle | 1 +
apps/i2ptunnel/build.gradle | 1 +
apps/sam/build.gradle | 1 +
core/build.gradle | 7 +++++++
router/build.gradle | 3 +++
5 files changed, 13 insertions(+)
diff --git a/apps/i2psnark/build.gradle b/apps/i2psnark/build.gradle
index 23137a0852..59c26076b6 100644
--- a/apps/i2psnark/build.gradle
+++ b/apps/i2psnark/build.gradle
@@ -11,6 +11,7 @@ sourceSets {
dependencies {
compile project(':core')
compile project(':apps:systray')
+ compile 'gnu.getopt:java-getopt:1.0.13'
providedCompile project(':apps:ministreaming')
providedCompile project(':apps:jetty')
}
diff --git a/apps/i2ptunnel/build.gradle b/apps/i2ptunnel/build.gradle
index 527f5135b2..85bd28c710 100644
--- a/apps/i2ptunnel/build.gradle
+++ b/apps/i2ptunnel/build.gradle
@@ -16,6 +16,7 @@ sourceSets {
dependencies {
compile project(':core')
compile project(':apps:ministreaming')
+ compile 'gnu.getopt:java-getopt:1.0.13'
providedCompile project(':apps:jetty')
}
diff --git a/apps/sam/build.gradle b/apps/sam/build.gradle
index c3bf372a70..312580ff24 100644
--- a/apps/sam/build.gradle
+++ b/apps/sam/build.gradle
@@ -14,4 +14,5 @@ sourceSets {
dependencies {
compile project(':core')
compile project(':apps:ministreaming')
+ compile 'gnu.getopt:java-getopt:1.0.13'
}
diff --git a/core/build.gradle b/core/build.gradle
index 5f37909d87..53eaf64cdf 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -6,6 +6,8 @@ sourceSets {
main {
java {
srcDir 'java/src'
+ exclude 'gnu/getopt'
+ exclude 'gnu/gettext'
}
resources {
srcDir 'java/src'
@@ -25,6 +27,11 @@ sourceSets {
}
}
+dependencies {
+ implementation 'gnu.getopt:java-getopt:1.0.13'
+ implementation 'org.gnu.gettext:libintl:0.18.3'
+}
+
configurations {
tests
}
diff --git a/router/build.gradle b/router/build.gradle
index e38bb9688b..ac8b369a95 100644
--- a/router/build.gradle
+++ b/router/build.gradle
@@ -4,6 +4,7 @@ sourceSets {
main {
java {
srcDir 'java/src'
+ exclude 'com'
}
}
test {
@@ -15,6 +16,8 @@ sourceSets {
dependencies {
api project(':core')
+ implementation 'com.maxmind.geoip:geoip-api:1.3.1'
+ implementation 'gnu.getopt:java-getopt:1.0.13'
testImplementation project(path: ':core', configuration: 'tests')
}
--
GitLab