diff options
author | Allan Wang <me@allanwang.ca> | 2019-08-16 00:24:22 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2019-08-16 00:24:22 -0700 |
commit | 71dcceaf1970873596a59a734f1a574120beff6b (patch) | |
tree | d8d79984f591ec5fc43ac93a15715eaef9b887d3 /sample/build.gradle | |
parent | d6f213563be35b183f81e20e95d925dbd65e4694 (diff) | |
parent | a9407288fad0d30e71e2f6862b66533e043f9311 (diff) | |
download | kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.gz kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.bz2 kau-71dcceaf1970873596a59a734f1a574120beff6b.zip |
Fix conflicts
Diffstat (limited to 'sample/build.gradle')
-rw-r--r-- | sample/build.gradle | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sample/build.gradle b/sample/build.gradle index 1441cf0..ab98695 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,3 +1,5 @@ +import kau.Dependencies + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' @@ -126,15 +128,15 @@ dependencies { implementation project(':searchview') implementation project(':mediapicker') - implementation kau.Dependencies.materialDialog("input") + implementation Dependencies.materialDialog("input") - testImplementation kau.Dependencies.kotlinTest - testImplementation kau.Dependencies.junit + testImplementation Dependencies.kotlinTest + testImplementation Dependencies.junit - androidTestImplementation kau.Dependencies.kotlinTest - androidTestImplementation kau.Dependencies.espresso - androidTestImplementation kau.Dependencies.espresso("intents") - androidTestImplementation kau.Dependencies.espresso("contrib") - androidTestImplementation kau.Dependencies.testRules - androidTestImplementation kau.Dependencies.testRunner + androidTestImplementation Dependencies.kotlinTest + androidTestImplementation Dependencies.espresso + androidTestImplementation Dependencies.espresso("intents") + androidTestImplementation Dependencies.espresso("contrib") + androidTestImplementation Dependencies.testRules + androidTestImplementation Dependencies.testRunner } |