From ab8cee459fb225776a732ca2cd514a1893840f0b Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 13 Nov 2018 10:22:38 +0100 Subject: [PATCH 1/7] Fixed netlayer and tor binary dependency issues --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0e310a4e30d..42187b1b081 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ configure(subprojects) { repositories { jcenter() maven { url 'https://jitpack.io' } - maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' } + maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/7.5/release/' } } dependencies { @@ -125,7 +125,7 @@ configure(project(':common')) { configure(project(':p2p')) { dependencies { compile project(':common') - compile('com.github.JesusMcCloud.netlayer:tor.native:0.4.7') { + compile('com.github.JesusMcCloud.netlayer:tor.native:0.4.7fix') { exclude(module: 'slf4j-api') } compile('org.apache.httpcomponents:httpclient:4.5.3') { From f0881b31e8bbf31ae85ec914aacbeeea87b15fdd Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 13 Nov 2018 10:37:08 +0100 Subject: [PATCH 2/7] remove unnecessary repo definition --- build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.gradle b/build.gradle index 42187b1b081..a281c8341ed 100644 --- a/build.gradle +++ b/build.gradle @@ -36,12 +36,6 @@ configure(subprojects) { os = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os } - repositories { - jcenter() - maven { url 'https://jitpack.io' } - maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/7.5/release/' } - } - dependencies { testCompile 'junit:junit:4.12' } From 1637b8e725cc074ca291cb2e90caa5684c6a8955 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 13 Nov 2018 10:43:05 +0100 Subject: [PATCH 3/7] readded crucial repo definitions --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index a281c8341ed..ed60be990a0 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,11 @@ configure(subprojects) { os = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os } + repositories { + jcenter() + maven {url 'https://jitpack.io' } + } + dependencies { testCompile 'junit:junit:4.12' } From 0d4d78ac525ee8de1a8d56ba0ee44bd0853157bc Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 13 Nov 2018 10:49:17 +0100 Subject: [PATCH 4/7] try netlayer git hash version --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ed60be990a0..6065b67e4fc 100644 --- a/build.gradle +++ b/build.gradle @@ -37,8 +37,8 @@ configure(subprojects) { } repositories { - jcenter() - maven {url 'https://jitpack.io' } + jcenter() + maven {url 'https://jitpack.io' } } dependencies { @@ -124,7 +124,7 @@ configure(project(':common')) { configure(project(':p2p')) { dependencies { compile project(':common') - compile('com.github.JesusMcCloud.netlayer:tor.native:0.4.7fix') { + compile('com.github.JesusMcCloud.netlayer:tor.native:5301395f29e41c5d1094c4d264ab016d354c2983') { exclude(module: 'slf4j-api') } compile('org.apache.httpcomponents:httpclient:4.5.3') { From ed8a8121a20974f59f26f28e4a0055b03f29b277 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 13 Nov 2018 18:41:31 +0100 Subject: [PATCH 5/7] added tor-binary repo --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 6065b67e4fc..01121198889 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,7 @@ configure(subprojects) { repositories { jcenter() maven {url 'https://jitpack.io' } + maven {url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/7.5/release/' } } dependencies { From 600e1ee3c8ee5c58b05e46f2834bf26e223def18 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 13 Nov 2018 19:11:58 +0100 Subject: [PATCH 6/7] fixed checksums --- gradle/witness/gradle-witness.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/witness/gradle-witness.gradle b/gradle/witness/gradle-witness.gradle index 376b0a8cef5..bdd47977980 100644 --- a/gradle/witness/gradle-witness.gradle +++ b/gradle/witness/gradle-witness.gradle @@ -20,7 +20,7 @@ dependencyVerification { 'de.jensd:fontawesomefx-commons:5539bb3335ecb822dbf928546f57766eeb9f1516cc1417a064b5709629612149', 'com.googlecode.jcsv:jcsv:73ca7d715e90c8d2c2635cc284543b038245a34f70790660ed590e157b8714a2', 'com.github.sarxos:webcam-capture:d960b7ea8ec3ddf2df0725ef214c3fccc9699ea7772df37f544e1f8e4fd665f6', - 'com.github.JesusMcCloud.netlayer:tor.native:c4c1ca96e6fbef3325db5d1cf9d6593ede4e6799b9242959fcce6f322cf5713c', + 'com.github.JesusMcCloud.netlayer:tor.native:ff5a3d8299968b76c99f01db2e751c815392c3c051e74e68868196e0b751c435', 'org.apache.httpcomponents:httpclient:db3d1b6c2d6a5e5ad47577ad61854e2f0e0936199b8e05eb541ed52349263135', 'net.sf.jopt-simple:jopt-simple:6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342', 'org.fxmisc.easybind:easybind:666af296dda6de68751668a62661571b5238ac6f1c07c8a204fc6f902b222aaf', @@ -37,7 +37,7 @@ dependencyVerification { 'com.google.code.findbugs:jsr305:c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd', 'com.google.guava:guava:36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8', 'com.google.inject:guice:9b9df27a5b8c7864112b4137fd92b36c3f1395bfe57be42fedf2f520ead1a93e', - 'com.github.JesusMcCloud.netlayer:tor:6341e4097534d500218320ba5e9dc1e926df0d913b7c949adc842db815cc8e1f', + 'com.github.JesusMcCloud.netlayer:tor:5638d93cf7ed43e9755d90a2104a8bd165ff964888fe786f6cf69f4872fff46f', 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:b306e0e6735841e31e320bf3260c71d60fc35057cfa87895f23251ee260a64a8', 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:169ee5879cba8444499243ceea5e6a2cb6ecea5424211cc819f0704501154b35', 'io.github.microutils:kotlin-logging:4992504fd3c6ecdf9ed10874b9508e758bb908af9e9d7af19a61e9afb6b7e27a', From fac1d2f307502a36d2a8052037571abd7b9a0a04 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 13 Nov 2018 19:19:41 +0100 Subject: [PATCH 7/7] switch to maven central --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 01121198889..ed42a5da3de 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ configure(subprojects) { } repositories { - jcenter() + mavenCentral() maven {url 'https://jitpack.io' } maven {url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/7.5/release/' } }