1 files changed, 31 insertions, 20 deletions

diff --git a/sample/build.gradle b/sample/build.gradle
index d20a972..ac6ee20 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,17 +1,7 @@
-plugins {
-    id 'com.gladed.androidgitversion' version '0.3.4'
-}
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.github.triplet.play'
 
-repositories {
-    jcenter()
-    mavenCentral()
-    maven { url "https://jitpack.io" }
-    maven { url "https://maven.google.com" }
-}
-
 play {
     jsonFile = file('../files/gplay-keys.json')
     track = 'beta'
@@ -24,16 +14,12 @@ android {
     compileSdkVersion Integer.parseInt(project.TARGET_SDK)
     buildToolsVersion project.BUILD_TOOLS
 
-    androidGitVersion {
-        codeFormat = 'MMNNPPBB'
-    }
-
     defaultConfig {
         applicationId "ca.allanwang.kau.sample"
         minSdkVersion Integer.parseInt(project.MIN_SDK)
         targetSdkVersion Integer.parseInt(project.TARGET_SDK)
-        versionCode androidGitVersion.code()
-        versionName androidGitVersion.name()
+        versionName project.VERSION_NAME
+        versionCode project.VERSION_CODE
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -69,9 +55,28 @@ android {
         checkReleaseBuilds false
     }
 
+    packagingOptions {
+        pickFirst 'META-INF/core_release.kotlin_module'
+        pickFirst 'META-INF/library_release.kotlin_module'
+    }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
         test.java.srcDirs += 'src/test/kotlin'
+        androidTest.java.srcDirs += 'src/androidTest/kotlin'
+        main.res.srcDirs += 'src/main/res-public'
+    }
+
+    testOptions.unitTests {
+        // Don't throw runtime exceptions for android calls that are not mocked
+        returnDefaultValues = true
+
+        // Always show the result of every unit test, even if it passes.
+        all {
+            testLogging {
+                events 'passed', 'skipped', 'failed', 'standardOut', 'standardError'
+            }
+        }
     }
 }
 
@@ -85,10 +90,16 @@ dependencies {
     compile project(':kpref-activity')
     compile project(':searchview')
     compile project(':mediapicker')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    testCompile 'junit:junit:4.12'
     compile "com.mikepenz:google-material-typeface:${IICON_GOOGLE}.original@aar"
     compile "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
+
+    androidTestCompile("com.android.support.test.espresso:espresso-core:${ESPRESSO}") {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    androidTestCompile("com.android.support.test:runner:${TEST_RUNNER}") {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    androidTestCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
+    testCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
+    testCompile "junit:junit:${JUNIT}"
 }