From e5536a5fc17514d24a6cfc89c5f9b537720f58e3 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Thu, 29 Jun 2017 10:12:18 -0700 Subject: Test kapt dependencies --- .idea/misc.xml | 2 +- app/build.gradle | 28 +++++++--------------------- app/src/main/res/drawable/frost_f_24.xml | 10 +++++----- 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 @@ - + 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 @@ + android:viewportHeight="177.16534" + android:viewportWidth="177.16534"> + android:strokeWidth="10" /> \ No newline at end of file -- cgit v1.2.3