apply patch

release-1.3.6

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"

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 'com.madgag.spongycastle:core:1.58.0.0'
 	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"

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"

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'
@@ -128,8 +128,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'
@@ -143,7 +143,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"

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"
 }

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"

submodule-patch.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# patch required to use briar as a gradle subproject (e.g. in brair-desktop):
+# 1. git merge <latest-release-tag>
+# 2. git checkout --theirs .
+# 3. git add .
+# 4. git merge --continue
+# 5. ./submodule-patch.sh
+# 6. git add .
+# 7. git commit -m "apply patch"
+
+sed -i "s/':bramble-/':briar:bramble-/g" bramble-{android,core,java}/build.gradle
+sed -i "s/':bramble-/':briar:bramble-/g" briar-{android,core,api}/build.gradle
+sed -i "s/':briar-/':briar:briar-/g" briar-{android,core,api}/build.gradle