Merge branch 'project-dependencies' into 'master'

Refactor dependencies to satisfy Android Studio's linter

See merge request briar/briar!1745
This commit is contained in:
akwizgran
2022-12-05 14:54:12 +00:00
13 changed files with 282 additions and 223 deletions

View File

@@ -9,18 +9,20 @@ apply from: 'witness.gradle'
apply from: '../dagger.gradle'
dependencies {
implementation project(path: ':briar-api', configuration: 'default')
api project(':briar-api')
implementation project(':bramble-core')
implementation 'com.rometools:rome:1.15.0'
implementation 'org.jdom:jdom2:2.0.6'
//noinspection GradleDependency
implementation "org.jsoup:jsoup:$jsoup_version"
implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
implementation 'org.jsoup:jsoup:1.15.3'
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: ':bramble-core', configuration: 'testOutput')
testImplementation 'net.jodah:concurrentunit:0.4.2'
testImplementation "junit:junit:$junit_version"
testImplementation "org.jmock:jmock:$jmock_version"
@@ -37,7 +39,7 @@ configurations {
testOutput.extendsFrom(testCompile)
}
task jarTest(type: Jar, dependsOn: testClasses) {
from sourceSets.test.output
from sourceSets.test.output, sourceSets.main.output
classifier = 'test'
}
artifacts {