Upgrade android gradle plugin to 3.3.2

This also updates some briar-headless dependencies
This commit is contained in:
Torsten Grote
2019-03-14 14:27:53 -03:00
parent 0a5a8310fc
commit 9ccd8d1602
6 changed files with 121 additions and 118 deletions

View File

@@ -1,8 +1,8 @@
plugins {
id 'java'
id 'idea'
id 'org.jetbrains.kotlin.jvm' version '1.2.71'
id 'org.jetbrains.kotlin.kapt' version '1.2.71'
id 'org.jetbrains.kotlin.jvm' version '1.3.21'
id 'org.jetbrains.kotlin.kapt' version '1.3.21'
id 'witness'
}
apply from: 'witness.gradle'
@@ -14,10 +14,10 @@ dependencies {
implementation project(path: ':briar-core', configuration: 'default')
implementation project(path: ':bramble-java', configuration: 'default')
implementation 'io.javalin:javalin:2.4.0'
implementation 'io.javalin:javalin:2.7.0'
implementation 'org.slf4j:slf4j-simple:1.7.25'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
implementation 'com.github.ajalt:clikt:1.5.0'
implementation 'com.github.ajalt:clikt:1.6.0'
kapt 'com.google.dagger:dagger-compiler:2.19'
@@ -28,7 +28,7 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
testImplementation "io.mockk:mockk:1.8.12"
testImplementation "io.mockk:mockk:1.9.2"
testImplementation "org.skyscreamer:jsonassert:1.5.0"
testImplementation 'khttp:khttp:0.1.0'