Fix versions and imports

20 files changed, 117 insertions, 129 deletions

diff --git a/app/build.gradle b/app/build.gradle
index d6cb216f..302d79c1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -180,92 +180,92 @@ dependencies {
     androidTestImplementation kau.Dependencies.espresso
     androidTestImplementation kau.Dependencies.testRules
     androidTestImplementation kau.Dependencies.testRunner
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:${KOTLIN}"
+    androidTestImplementation kau.Dependencies.kotlinReflect
 
     testImplementation kau.Dependencies.kotlinTest
-    testImplementation "org.jetbrains.kotlin:kotlin-reflect:${KOTLIN}"
+    testImplementation kau.Dependencies.kotlinReflect
     testImplementation kau.Dependencies.junit
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
+    implementation kau.Dependencies.kotlin
 
     //noinspection GradleDependency
-    implementation "ca.allanwang.kau:adapter:${Versions.kau}"
+    implementation "ca.allanwang.kau:adapter:${KAU}"
     //noinspection GradleDependency
-    implementation "ca.allanwang.kau:about:${Versions.kau}"
+    implementation "ca.allanwang.kau:about:${KAU}"
     //noinspection GradleDependency
-    implementation "ca.allanwang.kau:colorpicker:${Versions.kau}"
+    implementation "ca.allanwang.kau:colorpicker:${KAU}"
     //noinspection GradleDependency
-    implementation "ca.allanwang.kau:mediapicker:${Versions.kau}"
+    implementation "ca.allanwang.kau:mediapicker:${KAU}"
     //noinspection GradleDependency
-    implementation "ca.allanwang.kau:kpref-activity:${Versions.kau}"
+    implementation "ca.allanwang.kau:kpref-activity:${KAU}"
     //noinspection GradleDependency
-    implementation "ca.allanwang.kau:searchview:${Versions.kau}"
+    implementation "ca.allanwang.kau:searchview:${KAU}"
     //noinspection GradleDependency
-    implementation "ca.allanwang.kau:core:${Versions.kau}"
+    implementation "ca.allanwang.kau:core:${KAU}"
     //noinspection GradleDependency
-    implementation "ca.allanwang.kau:core-ui:${Versions.kau}"
+    implementation "ca.allanwang.kau:core-ui:${KAU}"
 
-    implementation "androidx.core:core-ktx:${KTX}"
+    implementation "androidx.core:core-ktx:${Versions.ktx}"
 
-    implementation "androidx.biometric:biometric:${ANDX_BIOMETRIC}"
+    implementation "androidx.biometric:biometric:${Versions.andxBiometric}"
 
-    implementation "org.koin:koin-android:${KOIN}"
-    testImplementation "org.koin:koin-test:${KOIN}"
-    androidTestImplementation "org.koin:koin-test:${KOIN}"
+    implementation "org.koin:koin-android:${Versions.koin}"
+    testImplementation "org.koin:koin-test:${Versions.koin}"
+    androidTestImplementation "org.koin:koin-test:${Versions.koin}"
 
-//    androidTestImplementation "io.mockk:mockk:${MOCKK}"
+//    androidTestImplementation "io.mockk:mockk:${Versions.mockk}"
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kau.Versions.coroutines}"
+    implementation kau.Dependencies.coroutines
 
-    implementation "org.apache.commons:commons-text:${COMMONS_TEXT}"
+    implementation "org.apache.commons:commons-text:${Versions.apacheCommonsText}"
 
-    implementation "com.devbrackets.android:exomedia:${EXOMEDIA}"
+    implementation "com.devbrackets.android:exomedia:${Versions.exoMedia}"
 
-    implementation "com.mikepenz:fastadapter-extensions:${kau.Versions.fastAdapter}@aar"
+    implementation kau.Dependencies.fastAdapter("extensions")
 
     //noinspection GradleDependency
-    implementation "com.github.bumptech.glide:okhttp3-integration:${kau.Versions.glide}"
+    implementation kau.Dependencies.glide
     //noinspection GradleDependency
-    kapt "com.github.bumptech.glide:compiler:${kau.Versions.glide}"
+    kapt kau.Dependencies.glideKapt
 
-    implementation "com.fasterxml.jackson.core:jackson-databind:${JACKSON}"
+    implementation "com.fasterxml.jackson.core:jackson-databind:${Versions.jackson}"
 
     //noinspection GradleDependency
-    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}"
+    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${Versions.leakCanary}"
     //noinspection GradleDependency
-    releaseTestImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}"
+    releaseTestImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${Versions.leakCanary}"
     //noinspection GradleDependency
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:${LEAK_CANARY}"
-//    testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:${Versions.leakCanary}"
+//    testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${Versions.leakCanary}"
 
-    implementation "com.github.Raizlabs.DBFlow:dbflow:${DBFLOW}"
-    implementation "com.github.Raizlabs.DBFlow:dbflow-core:${DBFLOW}"
-    kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${DBFLOW}"
-    implementation "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${DBFLOW}"
+    implementation "com.github.Raizlabs.DBFlow:dbflow:${Versions.dbflow}"
+    implementation "com.github.Raizlabs.DBFlow:dbflow-core:${Versions.dbflow}"
+    kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${Versions.dbflow}"
+    implementation "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${Versions.dbflow}"
 
     //Icons
-    implementation "com.mikepenz:material-design-iconic-typeface:${kau.Versions.iconicsMaterial}@aar"
-    implementation "com.mikepenz:community-material-typeface:${kau.Versions.iconicsCommunity}@aar"
+    implementation kau.Dependencies.iconicsMaterial
+    implementation kau.Dependencies.iconicsCommunity
 
-    implementation "org.jsoup:jsoup:${JSOUP}"
+    implementation "org.jsoup:jsoup:${Versions.jsoup}"
 
-    implementation "com.squareup.okhttp3:okhttp:${OKHTTP}"
-    implementation "com.squareup.okhttp3:logging-interceptor:${OKHTTP}"
-    testImplementation "com.squareup.okhttp3:mockwebserver:${OKHTTP}"
-    androidTestImplementation "com.squareup.okhttp3:mockwebserver:${OKHTTP}"
+    implementation "com.squareup.okhttp3:okhttp:${Versions.okhttp}"
+    implementation "com.squareup.okhttp3:logging-interceptor:${Versions.okhttp}"
+    testImplementation "com.squareup.okhttp3:mockwebserver:${Versions.okhttp}"
+    androidTestImplementation "com.squareup.okhttp3:mockwebserver:${Versions.okhttp}"
 
-    implementation "co.zsmb:materialdrawer-kt:${MATERIAL_DRAWER_KT}"
+    implementation "co.zsmb:materialdrawer-kt:${Versions.materialDrawerKt}"
 
-    implementation "com.bugsnag:bugsnag-android:${BUGSNAG}"
+    implementation kau.Dependencies.bugsnag
 
-    implementation "com.davemorrissey.labs:subsampling-scale-image-view:${SCALE_IMAGE_VIEW}"
+    implementation "com.davemorrissey.labs:subsampling-scale-image-view:${Versions.scaleImageView}"
 
-    implementation "com.sothree.slidinguppanel:library:${SLIDING_PANEL}"
+    implementation "com.sothree.slidinguppanel:library:${Versions.slidingPanel}"
 
-    implementation "androidx.room:room-coroutines:${ROOM}"
-    implementation "androidx.room:room-runtime:${ROOM}"
-    kapt "androidx.room:room-compiler:${ROOM}"
-    testImplementation "androidx.room:room-testing:${ROOM}"
+    implementation "androidx.room:room-ktx:${Versions.room}"
+    implementation "androidx.room:room-runtime:${Versions.room}"
+    kapt "androidx.room:room-compiler:${Versions.room}"
+    testImplementation "androidx.room:room-testing:${Versions.room}"
 
 }
 
@@ -290,7 +290,7 @@ configurations.all {
     resolutionStrategy.eachDependency { DependencyResolveDetails details ->
         def requested = details.requested
         if (requested.group == 'org.jetbrains.kotlin' && requested.name in kotlinResolutions) {
-            details.useVersion KOTLIN
+            details.useVersion kau.Versions.kotlin
         }
     }
 }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
index cf8acdd3..cc1ae466 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
@@ -28,7 +28,7 @@ import ca.allanwang.kau.utils.buildIsLollipopAndUp
 import ca.allanwang.kau.utils.setIcon
 import ca.allanwang.kau.utils.startActivity
 import ca.allanwang.kau.utils.string
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.activities.LoginActivity
 import com.pitchedapps.frost.activities.MainActivity
 import com.pitchedapps.frost.activities.SelectorActivity
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
index 56125303..3c5f71c2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -40,10 +40,10 @@ import ca.allanwang.kau.utils.withMinAlpha
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.entity.Library
 import com.mikepenz.aboutlibraries.entity.License
-import com.mikepenz.community_material_typeface_library.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import com.mikepenz.fastadapter.IItem
 import com.mikepenz.fastadapter.items.AbstractItem
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.mikepenz.iconics.typeface.IIcon
 import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.R
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
index b2946852..ea062cf7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -60,7 +60,7 @@ import co.zsmb.materialdrawerkt.draweritems.profile.profileSetting
 import com.afollestad.materialdialogs.checkbox.checkBoxPrompt
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.tabs.TabLayout
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.IIcon
 import com.mikepenz.materialdrawer.AccountHeader
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
index a1b41830..0ad0204f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
@@ -25,7 +25,7 @@ import ca.allanwang.kau.internal.KauBaseActivity
 import ca.allanwang.kau.utils.launchMain
 import ca.allanwang.kau.utils.setIcon
 import ca.allanwang.kau.utils.visible
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.injectors.JsActions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
index 6b031a03..de553376 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -42,7 +42,7 @@ import ca.allanwang.kau.utils.withMinAlpha
 import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.mikepenz.iconics.typeface.IIcon
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.facebook.FB_IMAGE_ID_MATCHER
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
index 1e106765..e1d03314 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
@@ -41,7 +41,7 @@ import ca.allanwang.kau.utils.postDelayed
 import ca.allanwang.kau.utils.scaleXY
 import ca.allanwang.kau.utils.setIcon
 import ca.allanwang.kau.utils.statusBarColor
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.intro.BaseIntroFragment
 import com.pitchedapps.frost.intro.IntroAccountFragment
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
index 3007933c..e78da3be 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
@@ -37,8 +37,8 @@ import ca.allanwang.kau.utils.string
 import ca.allanwang.kau.utils.tint
 import ca.allanwang.kau.utils.withSceneTransitionAnimation
 import com.afollestad.materialdialogs.list.listItems
-import com.mikepenz.community_material_typeface_library.CommunityMaterial
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.enums.Support
 import com.pitchedapps.frost.settings.getAppearancePrefs
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
index 6ad7d3f2..c6bcbb6a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
@@ -32,7 +32,7 @@ import ca.allanwang.kau.utils.withAlpha
 import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter
 import com.mikepenz.fastadapter_extensions.drag.ItemTouchCallback
 import com.mikepenz.fastadapter_extensions.drag.SimpleDragCallback
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.db.GenericDao
 import com.pitchedapps.frost.db.TAB_COUNT
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index 9a1e7308..ff31b56b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -47,8 +47,8 @@ import ca.allanwang.kau.utils.toast
 import ca.allanwang.kau.utils.withAlpha
 import ca.allanwang.kau.utils.withMainContext
 import com.google.android.material.snackbar.BaseTransientBottomBar
-import com.mikepenz.community_material_typeface_library.CommunityMaterial
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.contracts.ActivityContract
 import com.pitchedapps.frost.contracts.FileChooserContract
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
index 82e15111..16952e49 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
@@ -17,10 +17,10 @@
 package com.pitchedapps.frost.facebook
 
 import androidx.annotation.StringRes
-import com.mikepenz.community_material_typeface_library.CommunityMaterial
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.mikepenz.iconics.typeface.IIcon
-import com.mikepenz.material_design_iconic_typeface_library.MaterialDesignIconic
+import com.mikepenz.iconics.typeface.library.materialdesigniconic.MaterialDesignIconic
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.fragments.BaseFragment
 import com.pitchedapps.frost.fragments.MenuFragment
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt
index 72367eaa..c81c780b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt
@@ -17,7 +17,7 @@
 package com.pitchedapps.frost.fragments
 
 import android.webkit.WebView
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.contracts.MainFabContract
 import com.pitchedapps.frost.facebook.FbItem
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroImageFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroImageFragments.kt
index 1fd8c76e..bddf42b2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroImageFragments.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroImageFragments.kt
@@ -27,7 +27,7 @@ import ca.allanwang.kau.utils.setIcon
 import ca.allanwang.kau.utils.tint
 import ca.allanwang.kau.utils.visible
 import ca.allanwang.kau.utils.withAlpha
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.launchTabCustomizerActivity
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
index 0269b1a9..98909e0a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
@@ -31,7 +31,7 @@ import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.db.CookieEntity
 import com.pitchedapps.frost.facebook.profilePictureUrl
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt
index 4d88ad3d..6593a8df 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt
@@ -38,7 +38,7 @@ import ca.allanwang.kau.utils.setMenuIcons
 import ca.allanwang.kau.utils.visible
 import ca.allanwang.kau.utils.withMinAlpha
 import com.devbrackets.android.exomedia.listener.VideoControlsVisibilityListener
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.db.FrostDatabase
 import com.pitchedapps.frost.db.currentCookie
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt
index e63fcc21..0d596086 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt
@@ -34,7 +34,7 @@ import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 import com.mikepenz.fastadapter.listeners.ClickEventHook
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.mikepenz.iconics.typeface.IIcon
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.utils.Prefs
diff --git a/build.gradle b/build.gradle
index db5deb92..cc64b047 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,13 +8,11 @@ buildscript {
 
     dependencies {
         classpath kau.Plugins.android
-//        classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02'
-//        classpath "com.android.tools.build:gradle:${ANDROID_GRADLE}"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN}"
-        classpath "com.bugsnag:bugsnag-android-gradle-plugin:${BUGSNAG_PLUGIN}"
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:${SPOTLESS}"
-        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${DEX_PLUGIN}"
-        classpath "com.gladed.androidgitversion:gradle-android-git-version:${GIT_PLUGIN}"
+        classpath kau.Plugins.kotlin
+        classpath kau.Plugins.bugsnag
+        classpath kau.Plugins.spotless
+        classpath kau.Plugins.dexCount
+        classpath kau.Plugins.gitVersion
     }
 
     wrapper.setDistributionType(Wrapper.DistributionType.ALL)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 50603069..0c518118 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -9,8 +9,16 @@ repositories {
     maven("https://jitpack.io")
 }
 
-val KAU: String = "db3b6c0"
+// Currently can't read properties from root project
+// Reading it manually since it's simple
+val rootProps =
+    File(project.rootDir.let { if (it.name == "buildSrc") it.parent else it.absolutePath }, "gradle.properties")
+val kau = rootProps.useLines {
+    it.first { s -> s.startsWith("KAU=") }
+}.substring(4).trim()
+
+println("Using kau $kau")
 
 dependencies {
-    implementation("ca.allanwang.kau:gradle-plugin:$KAU")
+    implementation("ca.allanwang.kau:gradle-plugin:$kau")
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 6ed886e4..df15d665 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,5 +1,37 @@
 object Versions {
 
-    const val kau = "db3b6c0"
+    const val andxBiometric = "1.0.0-alpha04"
 
+    // https://mvnrepository.com/artifact/org.apache.commons/commons-text
+    // Updates blocked due to javax.script dependency
+    const val apacheCommonsText = "1.4"
+    // https://github.com/Raizlabs/DBFlow/releases
+    const val dbflow = "4.2.4"
+    // https://github.com/brianwernick/ExoMedia/releases
+    const val exoMedia = "4.3.0"
+    // https://github.com/InsertKoinIO/koin/blob/master/CHANGELOG.md
+    const val koin = "2.0.0-rc-2"
+    // https://github.com/mockk/mockk/releases
+    const val mockk = "1.9.3"
+    // https://mvnrepository.com/artifact/androidx.core/core-ktx?repo=google
+    const val ktx = "1.0.2"
+
+    // https://github.com/FasterXML/jackson-core/releases
+    const val jackson = "2.9.8"
+    // https://github.com/jhy/jsoup/releases
+    const val jsoup = "1.11.3"
+    // https://github.com/square/leakcanary/releases
+    const val leakCanary = "1.6.2"
+    // https://github.com/zsmb13/MaterialDrawerKt/releases
+    const val materialDrawerKt = "2.0.1"
+    // https://github.com/square/okhttp/releases
+    const val okhttp = "3.14.1"
+    // https://developer.android.com/jetpack/androidx/releases/room
+    const val room = "2.1.0-rc01"
+    // http://robolectric.org/getting-started/
+    const val roboelectric = "4.2"
+    // https://github.com/davemorrissey/subsampling-scale-image-view#quick-start
+    const val scaleImageView = "3.10.0"
+    // https://github.com/umano/AndroidSlidingUpPanel#importing-the-library
+    const val slidingPanel = "3.4.0"
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 749c1f51..4b4a34bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,57 +16,7 @@ org.gradle.daemon = true
 APP_ID=Frost
 APP_GROUP=com.pitchedapps
 
-KAU=1ac55ac
-KOTLIN=1.3.31
-
-# https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
-ANDROID_GRADLE=3.4.1
-
-# https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md
-SPOTLESS=3.21.1
-
-ANDX_BIOMETRIC=1.0.0-alpha04
-
-# https://github.com/bugsnag/bugsnag-android/releases
-BUGSNAG=4.12.0
-# https://github.com/bugsnag/bugsnag-android-gradle-plugin/releases
-BUGSNAG_PLUGIN=4.1.1
-# https://github.com/KeepSafe/dexcount-gradle-plugin/releases
-DEX_PLUGIN=0.8.5
-# https://github.com/gladed/gradle-android-git-version/releases
-GIT_PLUGIN=0.4.9
-# https://mvnrepository.com/artifact/org.apache.commons/commons-text
-# Updates blocked due to javax.script dependency
-COMMONS_TEXT=1.4
-# https://github.com/Raizlabs/DBFlow/releases
-DBFLOW=4.2.4
-# https://github.com/brianwernick/ExoMedia/releases
-EXOMEDIA=4.3.0
-# https://github.com/InsertKoinIO/koin/blob/master/CHANGELOG.md
-KOIN=2.0.0-rc-2
-# https://github.com/mockk/mockk/releases
-MOCKK=1.9.3
-# https://mvnrepository.com/artifact/androidx.core/core-ktx?repo=google
-KTX=1.0.1
-
-# https://github.com/FasterXML/jackson-core/releases
-JACKSON=2.9.8
-# https://github.com/jhy/jsoup/releases
-JSOUP=1.11.3
-# https://github.com/square/leakcanary/releases
-LEAK_CANARY=1.6.2
-# https://github.com/zsmb13/MaterialDrawerKt/releases
-MATERIAL_DRAWER_KT=2.0.1
-# https://github.com/square/okhttp/releases
-OKHTTP=3.14.1
-# https://developer.android.com/jetpack/androidx/releases/room
-ROOM=2.1.0-alpha04
-# http://robolectric.org/getting-started/
-ROBOELECTRIC=4.2
-# https://github.com/davemorrissey/subsampling-scale-image-view#quick-start
-SCALE_IMAGE_VIEW=3.10.0
-# https://github.com/umano/AndroidSlidingUpPanel#importing-the-library
-SLIDING_PANEL=3.4.0
+KAU=318e42c
 
 android.useAndroidX=true
 android.enableJetifier=true