aboutsummaryrefslogtreecommitdiff
path: root/app/build.gradle
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-08-18 14:40:08 -0700
committerGitHub <noreply@github.com>2017-08-18 14:40:08 -0700
commit52bfdb66ca8d44986b3f1ae51c921a939db17ac6 (patch)
tree32f58037b4091ed19a15f71b6cf7ee358a6f5820 /app/build.gradle
parent2eaad9b72746d57c187d2ded7f40d803f88dfcee (diff)
downloadfrost-52bfdb66ca8d44986b3f1ae51c921a939db17ac6.tar.gz
frost-52bfdb66ca8d44986b3f1ae51c921a939db17ac6.tar.bz2
frost-52bfdb66ca8d44986b3f1ae51c921a939db17ac6.zip
Misc (#190)
* Update play store description * Finalize description * Update kotlin and bg2 for custom themes * Update to Android Studio 3.0 beta 2 * Update test dependencies and add logging to image activity * Rename throwable to errorRef * Update searchview and media picker through kau
Diffstat (limited to 'app/build.gradle')
-rw-r--r--app/build.gradle15
1 files changed, 9 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 920b9fd1..4658f263 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -104,6 +104,7 @@ android {
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDirs += 'src/test/kotlin'
+ androidTest.java.srcDirs += 'src/androidTest/kotlin'
}
packagingOptions {
@@ -119,11 +120,15 @@ repositories {
}
dependencies {
- androidTestImplementation('com.android.support.test.espresso:espresso-core:2.3-alpha', {
+ androidTestImplementation("com.android.support.test:runner:${TEST_RUNNER}") {
exclude group: 'com.android.support', module: 'support-annotations'
- })
- testImplementation 'junit:junit:4.12'
- testImplementation "org.robolectric:robolectric:${ROBOELECTRIC}"
+ }
+ androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
+ androidTestImplementation "com.android.support.test:rules:${TEST_RULE}"
+ testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
+ testImplementation "junit:junit:${JUNIT}"
+
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
//noinspection GradleDependency
implementation "ca.allanwang.kau:adapter:$KAU"
@@ -142,8 +147,6 @@ dependencies {
//noinspection GradleDependency
implementation "ca.allanwang.kau:core-ui:$KAU"
- testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
-
debugImplementation "com.squareup.leakcanary:leakcanary-android:${LEAK_CANARY}"
releaseTestImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}"
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}"