From c2e71ef52fa18d9744fd8feaf74d8cfaeff93466 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 2 Dec 2022 17:43:52 +0000 Subject: [PATCH] Remove configuration: default, make transitive dependencies explicit. --- bramble-android/build.gradle | 11 ++++----- bramble-android/witness.gradle | 1 - bramble-api/build.gradle | 2 +- bramble-core/build.gradle | 9 +++---- bramble-java/build.gradle | 3 ++- bramble-java/witness.gradle | 2 ++ briar-android/build.gradle | 12 ++++----- briar-api/build.gradle | 2 +- briar-core/build.gradle | 5 ++-- briar-core/witness.gradle | 2 ++ briar-headless/build.gradle | 14 ++++++----- briar-headless/witness.gradle | 34 +++++++++++++++++--------- build.gradle | 2 +- mailbox-integration-tests/build.gradle | 9 ++++--- 14 files changed, 61 insertions(+), 47 deletions(-) diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index d24e2a78f..a1a0ff5c4 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -40,16 +40,15 @@ configurations { } dependencies { - // To satisfy Android Studio's linter, an Android module that depends on another module must - // not specify which configuration of the other module it depends on. Therefore we don't - // inherit implementation dependencies of the other module and must declare any such - // dependencies we want to use. + // In theory this dependency shouldn't be needed, but without it Android Studio's linter will + // complain about unresolved symbols for bramble-api test classes in bramble-android tests, + // even though the bramble-api test classes are provided by the testImplementation dependency + // below and the compiler can find them implementation project(':bramble-api') + implementation project(':bramble-core') implementation 'androidx.annotation:annotation:1.5.0' - implementation "org.briarproject:jtorctl:$jtorctl_version" - implementation "com.google.dagger:dagger:$dagger_version" tor "org.briarproject:tor-android:$tor_version" tor "org.briarproject:obfs4proxy-android:$obfs4proxy_version" diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index f419ed21f..788a6185b 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -24,7 +24,6 @@ dependencyVerification { 'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0', 'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd', 'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047', - 'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b', 'org.briarproject:obfs4proxy-android:0.0.14-tor1:obfs4proxy-android-0.0.14-tor1.jar:8b08068778b133484b17956d8f7a7710739c33f671a26a68156f4d34e6f28c30', 'org.briarproject:snowflake-android:2.3.1:snowflake-android-2.3.1.jar:1f83c9a070f87b7074af13627709a8b5aced5460104be7166af736b1bb73c293', 'org.briarproject:tor-android:0.4.5.14:tor-android-0.4.5.14.jar:7cf1beaa6c1db51fc8fac263aba9624ef289c3db29772509efcbc59f7057330a', diff --git a/bramble-api/build.gradle b/bramble-api/build.gradle index be5059cc0..1f8156219 100644 --- a/bramble-api/build.gradle +++ b/bramble-api/build.gradle @@ -10,8 +10,8 @@ dependencies { api 'org.briarproject:null-safety:0.1' api 'com.google.code.findbugs:jsr305:3.0.2' api 'javax.inject:javax.inject:1' + api "com.google.dagger:dagger:$dagger_version" - implementation "com.google.dagger:dagger:$dagger_version" implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" testImplementation "junit:junit:$junit_version" diff --git a/bramble-core/build.gradle b/bramble-core/build.gradle index d5b796319..f758c08a4 100644 --- a/bramble-core/build.gradle +++ b/bramble-core/build.gradle @@ -9,18 +9,17 @@ apply from: 'witness.gradle' apply from: '../dagger.gradle' dependencies { - api project(path: ':bramble-api', configuration: 'default') + api project(':bramble-api') - implementation 'org.bouncycastle:bcprov-jdk15to18:1.71' + api 'org.briarproject:jtorctl:0.5' + + implementation "org.bouncycastle:bcprov-jdk15to18:$bouncy_castle_version" //noinspection GradleDependency implementation 'com.h2database:h2:1.4.192' // The last version that supports Java 1.6 implementation 'org.bitlet:weupnp:0.1.4' implementation 'net.i2p.crypto:eddsa:0.2.0' implementation 'org.whispersystems:curve25519-java:0.5.0' - implementation "org.briarproject:jtorctl:$jtorctl_version" implementation 'org.briarproject:socks-socket:0.1' - - //noinspection GradleDependency implementation "com.squareup.okhttp3:okhttp:$okhttp_version" implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" diff --git a/bramble-java/build.gradle b/bramble-java/build.gradle index 5631ffc1a..eed7b690f 100644 --- a/bramble-java/build.gradle +++ b/bramble-java/build.gradle @@ -12,7 +12,7 @@ configurations { } dependencies { - implementation project(path: ':bramble-core', configuration: 'default') + implementation project(':bramble-core') implementation fileTree(dir: 'libs', include: '*.jar') def jna_version = '4.5.2' @@ -34,6 +34,7 @@ dependencies { testImplementation "junit:junit:$junit_version" testImplementation "org.jmock:jmock:$jmock_version" testImplementation "org.jmock:jmock-junit4:$jmock_version" + testImplementation "com.squareup.okhttp3:okhttp:$okhttp_version" testAnnotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" } diff --git a/bramble-java/witness.gradle b/bramble-java/witness.gradle index 203b6ec34..336497015 100644 --- a/bramble-java/witness.gradle +++ b/bramble-java/witness.gradle @@ -15,6 +15,8 @@ dependencyVerification { 'com.google.guava:guava:31.0.1-jre:guava-31.0.1-jre.jar:d5be94d65e87bd219fb3193ad1517baa55a3b88fc91d21cf735826ab5af087b9', 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99', 'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b', + 'com.squareup.okhttp3:okhttp:3.12.13:okhttp-3.12.13.jar:508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82', + 'com.squareup.okio:okio:1.15.0:okio-1.15.0.jar:693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2', 'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291', 'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', 'junit:junit:4.13.2:junit-4.13.2.jar:8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3', diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 3148c92b7..a78e0bee4 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -98,14 +98,14 @@ android { } dependencies { - // To satisfy Android Studio's linter, an Android module that depends on another module must - // not specify which configuration of the other module it depends on. Therefore we don't - // inherit implementation dependencies of the other module and must declare any such - // dependencies we want to use. + // In theory this dependency shouldn't be needed, but without it Android Studio's linter will + // complain about unresolved symbols for bramble-api test classes in briar-android tests, + // even though the bramble-api test classes are provided by the testImplementation dependency + // below and the compiler can find them implementation project(':bramble-api') + implementation project(':bramble-core') implementation project(':bramble-android') - implementation project(':briar-api') implementation project(':briar-core') implementation 'androidx.fragment:fragment:1.3.4' @@ -117,8 +117,6 @@ dependencies { implementation 'androidx.recyclerview:recyclerview-selection:1.1.0' implementation 'org.briarproject:dont-kill-me-lib:0.2.5' - implementation "com.google.dagger:dagger:$dagger_version" - //noinspection GradleDependency implementation "com.squareup.okhttp3:okhttp:$okhttp_version" implementation "org.jsoup:jsoup:$jsoup_version" implementation 'info.guardianproject.panic:panic:1.0' diff --git a/briar-api/build.gradle b/briar-api/build.gradle index c31fb9b53..e68ff2c85 100644 --- a/briar-api/build.gradle +++ b/briar-api/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'witness' apply from: 'witness.gradle' dependencies { - implementation project(path: ':bramble-api', configuration: 'default') + implementation project(':bramble-api') signature 'org.codehaus.mojo.signature:java16:1.1@signature' diff --git a/briar-core/build.gradle b/briar-core/build.gradle index 3ffef3846..181d642b9 100644 --- a/briar-core/build.gradle +++ b/briar-core/build.gradle @@ -9,13 +9,14 @@ apply from: 'witness.gradle' apply from: '../dagger.gradle' dependencies { - api project(path: ':briar-api', configuration: 'default') + api project(':briar-api') - implementation project(path: ':bramble-core', configuration: 'default') + implementation project(':bramble-core') implementation 'com.rometools:rome:1.15.0' implementation 'org.jdom:jdom2:2.0.6' implementation "org.jsoup:jsoup:$jsoup_version" + implementation "com.squareup.okhttp3:okhttp:$okhttp_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" diff --git a/briar-core/witness.gradle b/briar-core/witness.gradle index e7e229d9f..44f776ce4 100644 --- a/briar-core/witness.gradle +++ b/briar-core/witness.gradle @@ -17,6 +17,8 @@ dependencyVerification { 'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b', 'com.rometools:rome-utils:1.15.0:rome-utils-1.15.0.jar:2aaa1e95e0630ba5f4c183201f5ca6af8cecebcbf3494e7d11b903c9d1277cb8', 'com.rometools:rome:1.15.0:rome-1.15.0.jar:51cbcedae56ee0c32f25f3a367a6a9dadeef0f591d2f23d03486aec272e4d3f9', + 'com.squareup.okhttp3:okhttp:3.12.13:okhttp-3.12.13.jar:508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82', + 'com.squareup.okio:okio:1.15.0:okio-1.15.0.jar:693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2', 'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291', 'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', 'junit:junit:4.13.2:junit-4.13.2.jar:8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3', diff --git a/briar-headless/build.gradle b/briar-headless/build.gradle index 78fd4e5f0..faedc8327 100644 --- a/briar-headless/build.gradle +++ b/briar-headless/build.gradle @@ -17,17 +17,19 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 dependencies { - implementation project(path: ':bramble-core', configuration: 'default') - implementation project(path: ':bramble-java', configuration: 'default') - implementation project(path: ':briar-core', configuration: 'default') + implementation project(':bramble-core') + implementation project(':bramble-java') + implementation project(':briar-core') implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10' implementation 'io.javalin:javalin:3.5.0' implementation 'org.slf4j:slf4j-simple:1.7.30' implementation 'com.github.ajalt:clikt:2.2.0' + implementation "org.bouncycastle:bcprov-jdk15to18:$bouncy_castle_version" + implementation "com.squareup.okhttp3:okhttp:$okhttp_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" - def daggerVersion = '2.24' - kapt "com.google.dagger:dagger-compiler:$daggerVersion" + kapt "com.google.dagger:dagger-compiler:$dagger_version" testImplementation project(path: ':bramble-api', configuration: 'testOutput') testImplementation project(path: ':bramble-core', configuration: 'testOutput') @@ -42,7 +44,7 @@ dependencies { testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion" - kaptTest "com.google.dagger:dagger-compiler:$daggerVersion" + kaptTest "com.google.dagger:dagger-compiler:$dagger_version" } void jarFactory(Jar jarTask, jarArchitecture) { diff --git a/briar-headless/witness.gradle b/briar-headless/witness.gradle index 680ca971e..b01d7bafa 100644 --- a/briar-headless/witness.gradle +++ b/briar-headless/witness.gradle @@ -1,22 +1,28 @@ dependencyVerification { verify = [ + 'com.fasterxml.jackson.core:jackson-annotations:2.13.4:jackson-annotations-2.13.4.jar:ac5b27a634942391ca113850ee7db01df1499a240174021263501c05fc653b44', + 'com.fasterxml.jackson.core:jackson-core:2.13.4:jackson-core-2.13.4.jar:4c2e043200edd9ee7ba6fc378bd5c17784a5bf2388e152d208068b51fd0839cf', + 'com.fasterxml.jackson.core:jackson-databind:2.13.4:jackson-databind-2.13.4.jar:c9faff420d9e2c7e1e4711dbeebec2506a32c9942027211c5c293d8d87807eb6', 'com.github.ajalt:clikt:2.2.0:clikt-2.2.0.jar:beb3136d06764ec8ce0810a8fd6c8b7b49d04287d1deef3a07c016e43a458d33', 'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7', - 'com.google.dagger:dagger-compiler:2.24:dagger-compiler-2.24.jar:3c5afb955fb188da485cb2c048eff37dce0e1530b9780a0f2f7187d16d1ccc1f', - 'com.google.dagger:dagger-producers:2.24:dagger-producers-2.24.jar:f10f45b95191954d5d6b043fca9e62fb621d21bf70634b8f8476c7988b504c3a', - 'com.google.dagger:dagger-spi:2.24:dagger-spi-2.24.jar:c038445d14dbcb4054e61bf49e05009edf26fce4fdc7ec1a9db544784f68e718', - 'com.google.dagger:dagger:2.24:dagger-2.24.jar:550a6e46a6dfcdf1d764887b6090cea94f783327e50e5c73754f18facfc70b64', - 'com.google.errorprone:error_prone_annotations:2.2.0:error_prone_annotations-2.2.0.jar:6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a', + 'com.google.dagger:dagger-compiler:2.43.2:dagger-compiler-2.43.2.jar:298c020ee6ed2f4cc651ebbfdb7f8de329b07c44b618d65be117846a850e2a03', + 'com.google.dagger:dagger-producers:2.43.2:dagger-producers-2.43.2.jar:e7f5d9ffc85d48a49c8e22e02833d418f7ccad5d7512f529964db5127ab915ff', + 'com.google.dagger:dagger-spi:2.43.2:dagger-spi-2.43.2.jar:3bae8d9dadeaaa5927da6f094389a560c12c05fec3d2711d2fa79292c7a7d7ad', + 'com.google.dagger:dagger:2.43.2:dagger-2.43.2.jar:c89681f7cbbf8c527bf4ac2748515d617fdb54a1d425c08d914fdc28192b5fe4', + 'com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6:symbol-processing-api-1.7.0-1.0.6.jar:adc29417be5ca9ff42118105fea4e36d9ef44987abfc41432309371a60198941', + 'com.google.errorprone:error_prone_annotations:2.7.1:error_prone_annotations-2.7.1.jar:cd5257c08a246cf8628817ae71cb822be192ef91f6881ca4a3fcff4f1de1cff3', 'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30', 'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e', 'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26', - 'com.google.guava:guava:27.1-jre:guava-27.1-jre.jar:4a5aa70cc968a4d137e599ad37553e5cfeed2265e8c193476d7119036c536fe7', + 'com.google.guava:guava:31.0.1-jre:guava-31.0.1-jre.jar:d5be94d65e87bd219fb3193ad1517baa55a3b88fc91d21cf735826ab5af087b9', 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99', - 'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6', + 'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b', + 'com.squareup.okhttp3:okhttp:3.12.13:okhttp-3.12.13.jar:508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82', 'com.squareup.okhttp3:okhttp:4.10.0:okhttp-4.10.0.jar:7580f14fa1691206e37081ad3f92063b1603b328da0bb316f2fef02e0562e7ec', 'com.squareup.okio:okio-jvm:3.0.0:okio-jvm-3.0.0.jar:be64a0cc1f28ea9cd5c970dd7e7557af72c808d738c495b397bf897c9921e907', + 'com.squareup.okio:okio:1.15.0:okio-1.15.0.jar:693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2', 'com.squareup.okio:okio:3.0.0:okio-metadata-3.0.0.jar:dcbe63ed43b2c90c325e9e6a0863e2e7605980bff5e728c6de1088be5574979e', - 'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90', + 'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291', 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1:android-json-0.0.20131108.vaadin1.jar:dfb7bae2f404cfe0b72b4d23944698cb716b7665171812a0a4d0f5926c0fac79', 'io.javalin:javalin:3.5.0:javalin-3.5.0.jar:6618f99ad4c241eefcaf3a02c85adc52ec346c9710e8eb5a3f1a916e3d7acec4', 'io.mockk:mockk-agent-api:1.12.4:mockk-agent-api-1.12.4.jar:6eb3407b1f88c0c0ced9636f82874100786b74b3b06c4354c4d85229779fdec8', @@ -26,7 +32,6 @@ dependencyVerification { 'io.mockk:mockk-dsl-jvm:1.12.4:mockk-dsl-jvm-1.12.4.jar:faee4b52def68fa182f89d23c2a45f2246ef88b6b1ba98346aa85f57e5ed630f', 'io.mockk:mockk-dsl:1.12.4:mockk-dsl-1.12.4.jar:7fc96f9ed5118c915a3890ba2e4090c9b283ae7bdc37ab83885415bdf77650e4', 'io.mockk:mockk:1.12.4:mockk-1.12.4.jar:2c34a3690b958a3cf38b82d0f4910dc9992fb078dce6f56d71498293557bf805', - 'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f', 'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', 'javax.servlet:javax.servlet-api:3.1.0:javax.servlet-api-3.1.0.jar:af456b2dd41c4e82cf54f3e743bc678973d9fe35bd4d3071fa05c7e5333b8482', 'net.bytebuddy:byte-buddy-agent:1.12.6:byte-buddy-agent-1.12.6.jar:9b29421fe4650b75fc3ed53590f914c54f932e334b3506cc00296dff73024183', @@ -34,9 +39,9 @@ dependencyVerification { 'net.java.dev.jna:jna:5.6.0:jna-5.6.0.jar:5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf', 'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd', 'org.apiguardian:apiguardian-api:1.1.0:apiguardian-api-1.1.0.jar:a9aae9ff8ae3e17a2a18f79175e82b16267c246fbbd3ca9dfbbb290b08dcfdd4', - 'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d', - 'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a', - 'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53', + 'org.bouncycastle:bcprov-jdk15to18:1.71:bcprov-jdk15to18-1.71.jar:143aaa4a40edd5fc2a18db7900059f6c16f4d931b94b94b20f7e2238e6662886', + 'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a', + 'org.checkerframework:checker-qual:3.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb', 'org.eclipse.jetty.websocket:websocket-api:9.4.20.v20190813:websocket-api-9.4.20.v20190813.jar:779a29060cc17bdeeeba147efc884ebff972cfff93dad2d37b11c93f95d4f67b', 'org.eclipse.jetty.websocket:websocket-client:9.4.20.v20190813:websocket-client-9.4.20.v20190813.jar:df5df7ea0b2d40e1011946cfa5fe27c86047f0c4e77ccc0b8c0c7f5518278bf3', 'org.eclipse.jetty.websocket:websocket-common:9.4.20.v20190813:websocket-common-9.4.20.v20190813.jar:a66eb0a5299e2f33addb0dca827cc95a0773c41a12ea70c0d52d51beabaecf65', @@ -63,10 +68,15 @@ dependencyVerification { 'org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10:kotlin-scripting-compiler-embeddable-1.7.10.jar:fcb8a0b3b7a95263dab8a0ccdd34fed02888700511eabb5613f75a007a4aa802', 'org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10:kotlin-scripting-compiler-impl-embeddable-1.7.10.jar:7119205985ebd721179fb0f35d1d511f96de14fbd48e6465119fcac6bffc8090', 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10:kotlin-scripting-jvm-1.7.10.jar:cf85511ce4e26fa3286d722f95ed54f16f2513a39ce3b85f2b567e575cb45a60', + 'org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0:kotlin-stdlib-common-1.7.0.jar:59c6ff64fe9a6604afce03e8aaa75f83586c6030ac71fb0b34ee7cdefed3618f', 'org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10:kotlin-stdlib-common-1.7.10.jar:19f102efe9629f8eabc63853ad15c533e47c47f91fca09285c5bde86e59f91d4', + 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.0:kotlin-stdlib-jdk7-1.7.0.jar:07e91be9b2ca20672d2bdb7e181b766e73453a2da13492b5ddaee8fa47aea239', 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10:kotlin-stdlib-jdk7-1.7.10.jar:54f61351b1936ad88f4e53059fe781e723eae51d78ed9e7422d8b403574ec682', + 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0:kotlin-stdlib-jdk8-1.7.0.jar:cf058e11db1dfc9944680c8c61b95ac689aaaa8a3eb30bced028100f038f030b', 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10:kotlin-stdlib-jdk8-1.7.10.jar:8aafdd60c94f454c92e5066d266a5ed53ecc63c78f623b3fd9db56fea4032873', + 'org.jetbrains.kotlin:kotlin-stdlib:1.7.0:kotlin-stdlib-1.7.0.jar:aa88e9625577957f3249a46cb6e166ee09b369e600f7a11d148d16b0a6d87f05', 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10:kotlin-stdlib-1.7.10.jar:e771fe74250a943e8f6346713201ff1d8cb95c3a5d1a91a22b65a9e04f6a8901', + 'org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0:kotlinx-metadata-jvm-0.5.0.jar:ca063a96639b08b9eaa0de4d65e899480740a6efbe28ab9a8681a2ced03055a4', 'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478', 'org.junit.jupiter:junit-jupiter-api:5.5.2:junit-jupiter-api-5.5.2.jar:249a2fdbd3931987c0298d00ca08ed248496e0fc11e0463c08c4f82e0cc79b1c', 'org.junit.jupiter:junit-jupiter-engine:5.5.2:junit-jupiter-engine-5.5.2.jar:6d777da9876e2ef7a0336e8f098f8d74a5a64f810aa3a4a2f5f3b766ce97837b', diff --git a/build.gradle b/build.gradle index a10b1a2d8..7a8670831 100644 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,8 @@ buildscript { tor_version = "0.4.5.14" obfs4proxy_version = "0.0.14-tor1" snowflake_version = "2.3.1" - jtorctl_version = '0.5' jsoup_version = '1.15.3' + bouncy_castle_version = '1.71' junit_version = "4.13.2" jmock_version = '2.12.0' } diff --git a/mailbox-integration-tests/build.gradle b/mailbox-integration-tests/build.gradle index 3b833cc2b..d086f7f15 100644 --- a/mailbox-integration-tests/build.gradle +++ b/mailbox-integration-tests/build.gradle @@ -6,16 +6,17 @@ apply plugin: 'idea' apply from: '../dagger.gradle' dependencies { - testImplementation project(path: ':bramble-api', configuration: 'default') + testImplementation project(':bramble-api') testImplementation project(path: ':bramble-api', configuration: 'testOutput') - testImplementation project(path: ':bramble-core', configuration: 'default') + testImplementation project(':bramble-core') testImplementation project(path: ':bramble-core', configuration: 'testOutput') - testImplementation project(path: ':mailbox-core', configuration: 'default') - testImplementation project(path: ':mailbox-lib', configuration: 'default') + testImplementation project(':mailbox-core') + testImplementation project(':mailbox-lib') testImplementation "junit:junit:$junit_version" testImplementation "ch.qos.logback:logback-classic:1.2.11" testImplementation 'net.jodah:concurrentunit:0.4.6' + testImplementation "com.squareup.okhttp3:okhttp:$okhttp_version" testAnnotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" }