From f5728b3d6362b85929ac8f03cbc87f26a778b596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= Date: Thu, 14 Oct 2021 09:18:23 +0200 Subject: [PATCH] Make briar usable as submodule --- bramble-android/build.gradle | 4 ++-- bramble-core/build.gradle | 4 ++-- bramble-java/build.gradle | 6 +++--- briar-android/build.gradle | 12 ++++++------ briar-api/build.gradle | 4 ++-- briar-core/build.gradle | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index 3de1d44fb..098632287 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -41,7 +41,7 @@ configurations { } dependencies { - implementation project(path: ':bramble-core', configuration: 'default') + implementation project(path: ':briar:bramble-core', configuration: 'default') tor 'org.briarproject:tor-android:0.3.5.15' tor 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a@zip' @@ -49,7 +49,7 @@ dependencies { compileOnly 'javax.annotation:jsr250-api:1.0' - testImplementation project(path: ':bramble-api', configuration: 'testOutput') + testImplementation project(path: ':briar:bramble-api', configuration: 'testOutput') testImplementation "junit:junit:$junit_version" testImplementation "org.jmock:jmock:$jmock_version" testImplementation "org.jmock:jmock-junit4:$jmock_version" diff --git a/bramble-core/build.gradle b/bramble-core/build.gradle index 7cfe1ef7e..9635c3fcf 100644 --- a/bramble-core/build.gradle +++ b/bramble-core/build.gradle @@ -9,7 +9,7 @@ apply from: 'witness.gradle' apply from: '../dagger.gradle' dependencies { - implementation project(path: ':bramble-api', configuration: 'default') + implementation project(path: ':briar:bramble-api', configuration: 'default') implementation 'org.bouncycastle:bcprov-jdk15on:1.69' implementation 'com.h2database:h2:1.4.192' // The last version that supports Java 1.6 implementation 'org.bitlet:weupnp:0.1.4' @@ -19,7 +19,7 @@ dependencies { annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" - testImplementation project(path: ':bramble-api', configuration: 'testOutput') + testImplementation project(path: ':briar:bramble-api', configuration: 'testOutput') testImplementation 'org.hsqldb:hsqldb:2.3.5' // The last version that supports Java 1.6 testImplementation 'net.jodah:concurrentunit:0.4.2' testImplementation "junit:junit:$junit_version" diff --git a/bramble-java/build.gradle b/bramble-java/build.gradle index ca1ee1eab..1a1a31871 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(path: ':briar:bramble-core', configuration: 'default') implementation fileTree(dir: 'libs', include: '*.jar') def jna_version = '4.5.2' implementation "net.java.dev.jna:jna:$jna_version" @@ -22,8 +22,8 @@ dependencies { annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" - testImplementation project(path: ':bramble-api', configuration: 'testOutput') - testImplementation project(path: ':bramble-core', configuration: 'testOutput') + testImplementation project(path: ':briar:bramble-api', configuration: 'testOutput') + testImplementation project(path: ':briar:bramble-core', configuration: 'testOutput') testImplementation "junit:junit:$junit_version" testImplementation "org.jmock:jmock:$jmock_version" testImplementation "org.jmock:jmock-junit4:$jmock_version" diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 98072b273..7c05fdbbd 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -96,9 +96,9 @@ android { } dependencies { - implementation project(path: ':briar-core', configuration: 'default') - implementation project(path: ':bramble-core', configuration: 'default') - implementation project(':bramble-android') + implementation project(path: ':briar:briar-core', configuration: 'default') + implementation project(path: ':briar:bramble-core', configuration: 'default') + implementation project(':briar:bramble-android') implementation 'androidx.fragment:fragment:1.3.4' implementation 'androidx.preference:preference:1.1.1' @@ -129,8 +129,8 @@ dependencies { compileOnly 'javax.annotation:jsr250-api:1.0' def espressoVersion = '3.3.0' - testImplementation project(path: ':bramble-api', configuration: 'testOutput') - testImplementation project(path: ':bramble-core', configuration: 'testOutput') + testImplementation project(path: ':briar:bramble-api', configuration: 'testOutput') + testImplementation project(path: ':briar:bramble-core', configuration: 'testOutput') testImplementation 'androidx.test:runner:1.3.0' testImplementation 'androidx.test.ext:junit:1.1.2' testImplementation 'androidx.fragment:fragment-testing:1.3.4' @@ -144,7 +144,7 @@ dependencies { testImplementation "org.jmock:jmock-legacy:$jmock_version" testAnnotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" - androidTestImplementation project(path: ':bramble-api', configuration: 'testOutput') + androidTestImplementation project(path: ':briar:bramble-api', configuration: 'testOutput') androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" diff --git a/briar-api/build.gradle b/briar-api/build.gradle index 06b7700af..41a345e37 100644 --- a/briar-api/build.gradle +++ b/briar-api/build.gradle @@ -7,10 +7,10 @@ apply plugin: 'witness' apply from: 'witness.gradle' dependencies { - implementation project(path: ':bramble-api', configuration: 'default') + implementation project(path: ':briar:bramble-api', configuration: 'default') signature 'org.codehaus.mojo.signature:java16:1.1@signature' - testImplementation project(path: ':bramble-api', configuration: 'testOutput') + testImplementation project(path: ':briar:bramble-api', configuration: 'testOutput') testImplementation "junit:junit:$junit_version" } diff --git a/briar-core/build.gradle b/briar-core/build.gradle index 758f1ab85..860e5733b 100644 --- a/briar-core/build.gradle +++ b/briar-core/build.gradle @@ -9,7 +9,7 @@ apply from: 'witness.gradle' apply from: '../dagger.gradle' dependencies { - implementation project(path: ':briar-api', configuration: 'default') + implementation project(path: ':briar:briar-api', configuration: 'default') implementation 'com.rometools:rome:1.15.0' implementation 'org.jdom:jdom2:2.0.6' // okhttp 3.12.x is supported until end of 2020, newer versions need minSdk 21 @@ -18,9 +18,9 @@ dependencies { annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" - testImplementation project(path: ':bramble-core', configuration: 'default') - testImplementation project(path: ':bramble-core', configuration: 'testOutput') - testImplementation project(path: ':bramble-api', configuration: 'testOutput') + testImplementation project(path: ':briar:bramble-core', configuration: 'default') + testImplementation project(path: ':briar:bramble-core', configuration: 'testOutput') + testImplementation project(path: ':briar:bramble-api', configuration: 'testOutput') testImplementation 'net.jodah:concurrentunit:0.4.2' testImplementation "junit:junit:$junit_version" testImplementation "org.jmock:jmock:$jmock_version"