Resolve conflict on cherry pick commit to use ByteBuddyClassImposteriser

This commit is contained in:
akwizgran
2021-09-02 14:39:27 +01:00
committed by ameba23
parent 67dbc3d9a0
commit 75f8d72e54
23 changed files with 310 additions and 115 deletions

View File

@@ -23,10 +23,9 @@ dependencies {
testImplementation project(path: ':bramble-api', configuration: 'testOutput')
testImplementation project(path: ':bramble-core', configuration: 'testOutput')
testImplementation 'junit:junit:4.12'
testImplementation "org.jmock:jmock:2.8.2"
testImplementation "org.jmock:jmock-junit4:2.8.2"
testImplementation "org.jmock:jmock-legacy:2.8.2"
testImplementation "junit:junit:$junit_version"
testImplementation "org.jmock:jmock:$jmock_version"
testImplementation "org.jmock:jmock-junit4:$jmock_version"
testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.24'
}