Convert onionwrapper from a submodule to a dependency.

This commit is contained in:
akwizgran
2023-03-29 12:03:57 +01:00
parent ec0a754289
commit cab8f834bd
13 changed files with 26 additions and 20 deletions

View File

@@ -29,8 +29,6 @@ dependencies {
implementation project(':bramble-core')
implementation project(':bramble-java')
implementation project(':briar-core')
implementation project(':onionwrapper-core')
implementation project(':onionwrapper-java')
linux "org.briarproject:tor-linux:$tor_version"
linux "org.briarproject:obfs4proxy-linux:$obfs4proxy_version"
@@ -47,6 +45,7 @@ dependencies {
implementation "org.bouncycastle:bcprov-jdk15to18:$bouncy_castle_version"
implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
implementation "org.briarproject:onionwrapper-java:$onionwrapper_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
@@ -73,9 +72,7 @@ void jarFactory(Jar jarTask, os, architecture, configuration) {
':bramble-core:jar',
':bramble-java:jar',
':briar-api:jar',
':briar-core:jar',
':onionwrapper-core:jar',
':onionwrapper-java:jar'
':briar-core:jar'
)
jarTask.dependsOn(jar)
jarTask.doFirst {