Clean up gradle and test build

3 files changed, 4 insertions, 44 deletions

diff --git a/searchbar/build.gradle b/searchbar/build.gradle
index 80394ea..78054b3 100644
--- a/searchbar/build.gradle
+++ b/searchbar/build.gradle
@@ -1,45 +1,7 @@
-plugins {
-    id 'com.gladed.androidgitversion' version '0.3.4'
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
-
-group = project.APP_GROUP
+apply from: '../android.gradle'
 
 android {
-    compileSdkVersion Integer.parseInt(project.TARGET_SDK)
-    buildToolsVersion project.BUILD_TOOLS
-
-    androidGitVersion {
-        codeFormat = 'MMNNPPBB'
-        prefix 'v'
-    }
-
-    defaultConfig {
-        minSdkVersion Integer.parseInt(project.MIN_SDK)
-        targetSdkVersion Integer.parseInt(project.TARGET_SDK)
-        versionCode androidGitVersion.code()
-        versionName androidGitVersion.name()
-        consumerProguardFiles 'progress-proguard.txt'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    lintOptions {
-        abortOnError false
-        checkReleaseBuilds false
-    }
-    resourcePrefix "kau_search_"
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-        test.java.srcDirs += 'src/test/kotlin'
-    }
+    resourcePrefix "kau_"
 }
 
 dependencies {
@@ -52,8 +14,8 @@ dependencies {
     compile project(':core-ui')
     compile project(':adapter')
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
+    testCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
 
 }
 
diff --git a/searchbar/src/main/kotlin/ca/allanwang/kau/searchview/SearchItem.kt b/searchbar/src/main/kotlin/ca/allanwang/kau/searchview/SearchItem.kt
index f1e49e0..75d9b27 100644
--- a/searchbar/src/main/kotlin/ca/allanwang/kau/searchview/SearchItem.kt
+++ b/searchbar/src/main/kotlin/ca/allanwang/kau/searchview/SearchItem.kt
@@ -10,7 +10,6 @@ import android.text.style.StyleSpan
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
-import ca.allanwang.kau.R
 import ca.allanwang.kau.iitems.KauIItem
 import ca.allanwang.kau.utils.*
 import com.mikepenz.google_material_typeface_library.GoogleMaterial
diff --git a/searchbar/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt b/searchbar/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt
index 59f4bc1..2178806 100644
--- a/searchbar/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt
+++ b/searchbar/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt
@@ -16,7 +16,6 @@ import android.view.*
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.ProgressBar
-import ca.allanwang.kau.R
 import ca.allanwang.kau.animators.NoAnimator
 import ca.allanwang.kau.kotlin.nonReadable
 import ca.allanwang.kau.searchview.SearchView.Configs