diff options
| author | Allan Wang <me@allanwang.ca> | 2018-12-24 01:49:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-24 01:49:57 -0500 |
| commit | 2c02356c498b3db6f13bd7a3af8689c24ca224ea (patch) | |
| tree | 726ad142a8a373715493cf602786361226f624ee /app/build.gradle | |
| parent | fce0bf0a6df09de78a804dc874f48f67336d9d9c (diff) | |
| parent | 697d01882ba8b1dbb85484ba3bf6e810e32448fc (diff) | |
| download | frost-2c02356c498b3db6f13bd7a3af8689c24ca224ea.tar.gz frost-2c02356c498b3db6f13bd7a3af8689c24ca224ea.tar.bz2 frost-2c02356c498b3db6f13bd7a3af8689c24ca224ea.zip | |
Merge branch 'dev' into update/coroutines
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/build.gradle b/app/build.gradle index 0e2bff04..ebf3ecf0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,6 +6,8 @@ apply plugin: 'kotlin-kapt' apply plugin: 'com.getkeepsafe.dexcount' apply plugin: 'com.gladed.androidgitversion' +apply from: '../spotless.gradle' + android { compileSdkVersion kau.targetSdk buildToolsVersion kau.buildTools @@ -23,7 +25,7 @@ android { versionCode androidGitVersion.code() versionName androidGitVersion.name() multiDexEnabled true - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } applicationVariants.all { variant -> @@ -148,14 +150,13 @@ repositories { } dependencies { - androidTestImplementation("com.android.support.test:runner:${kau.testRunner}") { - exclude group: 'com.android.support', module: 'support-annotations' - } - - implementation "com.android.support:exifinterface:${kau.supportLibs}" + implementation 'androidx.exifinterface:exifinterface:1.0.0' androidTestImplementation kauDependency.kotlinTest - androidTestImplementation "com.android.support.test:rules:${TEST_RULE}" + androidTestImplementation kauDependency.espresso + androidTestImplementation kauDependency.testRules + androidTestImplementation kauDependency.testRunner + testImplementation kauDependency.kotlinTest testImplementation "org.jetbrains.kotlin:kotlin-reflect:${KOTLIN}" testImplementation kauDependency.junit |