Test kapt dependencies

3 files changed, 13 insertions, 27 deletions

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 085136f8..7319f021 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -53,7 +53,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index bdf3f831..4523c403 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'io.fabric'
 
 android {
@@ -85,9 +86,7 @@ dependencies {
     })
     testCompile 'junit:junit:4.12'
 
-    compile("ca.allanwang:kau:${KAU}") {
-        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
-    }
+    compile "ca.allanwang:kau:${KAU}"
 
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:${KOTLIN}"
 
@@ -98,7 +97,6 @@ dependencies {
 
     compile "com.github.Raizlabs.DBFlow:dbflow:${DBFLOW}"
     compile "com.github.Raizlabs.DBFlow:dbflow-core:${DBFLOW}"
-    annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:${DBFLOW}"
     kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${DBFLOW}"
     compile "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${DBFLOW}"
 
@@ -109,24 +107,16 @@ dependencies {
     compile "org.jsoup:jsoup:${JSOUP}"
 
     compile "com.github.bumptech.glide:glide:${GLIDE}"
-    annotationProcessor "com.github.bumptech.glide:compiler:${GLIDE}"
+    kapt "com.github.bumptech.glide:compiler:${GLIDE}"
 
 //    compile("com.mikepenz:materialdrawer:${MATERIAL_DRAWER}@aar") {
 //        transitive = true
 //    }
-    compile("co.zsmb:materialdrawer-kt:${MATERIAL_DRAWER_KT}") {
-        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
-    }
+    compile "co.zsmb:materialdrawer-kt:${MATERIAL_DRAWER_KT}"
 
-    compile("nz.bradcampbell:paperparcel:${PAPER_PARCEL}") {
-        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
-    }
-    compile("nz.bradcampbell:paperparcel-kotlin:${PAPER_PARCEL}") {
-        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
-    }
-    kapt("nz.bradcampbell:paperparcel-compiler:${PAPER_PARCEL}") {
-        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
-    }
+    compile "nz.bradcampbell:paperparcel:${PAPER_PARCEL}"
+    compile "nz.bradcampbell:paperparcel-kotlin:${PAPER_PARCEL}"
+    kapt "nz.bradcampbell:paperparcel-compiler:${PAPER_PARCEL}"
 
     compile "com.jude:swipebackhelper:${SWIPE_BACK}"
 
@@ -134,7 +124,3 @@ dependencies {
         transitive = true;
     }
 }
-
-kapt {
-    generateStubs = true
-}
diff --git a/app/src/main/res/drawable/frost_f_24.xml b/app/src/main/res/drawable/frost_f_24.xml
index f9b207f1..b435fa03 100644
--- a/app/src/main/res/drawable/frost_f_24.xml
+++ b/app/src/main/res/drawable/frost_f_24.xml
@@ -2,13 +2,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="177.16534"
-    android:viewportHeight="177.16534">
+    android:viewportHeight="177.16534"
+    android:viewportWidth="177.16534">
 
     <path
+        android:pathData="M88.9405 31.61857l41.06143 23.88663M88.3467 31.59584l-31.358 18.2953M56.87005
+51.09542v94.26222M57.20726 87.2077l40.97656 23.86424"
         android:strokeColor="#000"
-        android:strokeWidth="10"
         android:strokeLineCap="round"
-        android:pathData="M84.0566 31.70696l41.06144 23.88663M83.4628 31.68423l-31.358 18.2953M51.98616
-51.1838v94.26223M52.32337 87.29608l40.97657 23.86425" />
+        android:strokeWidth="10" />
 </vector>
\ No newline at end of file