Update dependency structure

5 files changed, 24 insertions, 19 deletions

diff --git a/adapter/build.gradle b/adapter/build.gradle
index 4f38eae..2874275 100644
--- a/adapter/build.gradle
+++ b/adapter/build.gradle
@@ -1,12 +1,11 @@
-ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk
+import kau.Versions
+
+ext.kauSubModuleMinSdk = Versions.coreMinSdk
 
 apply from: '../android-lib.gradle'
 
 dependencies {
     implementation project(':core')
-
-    api kau.Dependencies.fastAdapter
-    api kau.Dependencies.fastAdapter('utils')
 }
 
 apply from: '../artifacts.gradle'
diff --git a/fastadapter/build.gradle b/fastadapter/build.gradle
index 43e9c7c..8472801 100644
--- a/fastadapter/build.gradle
+++ b/fastadapter/build.gradle
@@ -1,4 +1,7 @@
-ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk
+import kau.Dependencies
+import kau.Versions
+
+ext.kauSubModuleMinSdk = Versions.coreMinSdk
 
 apply from: '../android-lib.gradle'
 
@@ -6,8 +9,7 @@ dependencies {
     implementation project(':core')
     api project(':adapter')
 
-    api kau.Dependencies.fastAdapter
-//    api kau.Dependencies.fastAdapterCommons
+    api Dependencies.fastAdapter
 }
 
 apply from: '../artifacts.gradle'
diff --git a/sample/build.gradle b/sample/build.gradle
index 1441cf0..9a3473d 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,16 @@ dependencies {
     implementation project(':searchview')
     implementation project(':mediapicker')
 
-    implementation kau.Dependencies.materialDialog("input")
+    implementation Dependencies.materialDialog("input")
+    implementation Dependencies.fastAdapter("utils")
 
-    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
 }
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt
index f6d5ccc..a5ef8c3 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt
@@ -45,9 +45,7 @@ class AnimActivity : KauBaseActivity() {
         val adapter = FastItemAdapter<PermissionCheckbox>()
         setContentView(fullLinearRecycler(adapter).apply {
             setBackgroundColor(
-                KPrefSample.bgColor.withAlpha(
-                    255
-                )
+                KPrefSample.bgColor.withAlpha(255)
             )
         })
 
diff --git a/searchview/build.gradle b/searchview/build.gradle
index f9e83fc..e1d878f 100644
--- a/searchview/build.gradle
+++ b/searchview/build.gradle
@@ -1,3 +1,5 @@
+import kau.Dependencies
+
 ext.kauSubModuleResourcePrefix = "kau_search_"
 
 apply from: '../android-lib.gradle'
@@ -5,6 +7,7 @@ apply from: '../android-lib.gradle'
 dependencies {
     implementation project(':core-ui')
     implementation project(':fastadapter')
+    implementation Dependencies.fastAdapter('utils')
 }
 
 apply from: '../artifacts.gradle'