diff options
author | Allan Wang <me@allanwang.ca> | 2017-07-09 00:24:40 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-07-09 00:24:40 -0700 |
commit | 40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6 (patch) | |
tree | 523f72bd0c53817815fd0ab1aa7c3124a3264745 /adapter | |
parent | bcc7dd36752829b650b583fd6ee6168de3e6f95a (diff) | |
download | kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.tar.gz kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.tar.bz2 kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.zip |
Clean up gradle and test build
Diffstat (limited to 'adapter')
-rw-r--r-- | adapter/build.gradle | 44 | ||||
-rw-r--r-- | adapter/src/main/kotlin/ca/allanwang/kau/iitems/CardIItem.kt | 2 | ||||
-rw-r--r-- | adapter/src/main/kotlin/ca/allanwang/kau/iitems/HeaderIItem.kt | 2 |
3 files changed, 5 insertions, 43 deletions
diff --git a/adapter/build.gradle b/adapter/build.gradle index 82c89b0..7894627 100644 --- a/adapter/build.gradle +++ b/adapter/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_" - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - test.java.srcDirs += 'src/test/kotlin' - } } dependencies { @@ -51,8 +13,8 @@ dependencies { compile project(':core') - 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}" compile "com.mikepenz:fastadapter:${FAST_ADAPTER}@aar" compile "com.mikepenz:fastadapter-commons:${FAST_ADAPTER_COMMONS}@aar" diff --git a/adapter/src/main/kotlin/ca/allanwang/kau/iitems/CardIItem.kt b/adapter/src/main/kotlin/ca/allanwang/kau/iitems/CardIItem.kt index 3380ade..68b247c 100644 --- a/adapter/src/main/kotlin/ca/allanwang/kau/iitems/CardIItem.kt +++ b/adapter/src/main/kotlin/ca/allanwang/kau/iitems/CardIItem.kt @@ -9,7 +9,7 @@ import android.widget.Button import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView -import ca.allanwang.kau.R +import ca.allanwang.kau.adapter.R import ca.allanwang.kau.adapters.ThemableIItem import ca.allanwang.kau.adapters.ThemableIItemDelegate import ca.allanwang.kau.utils.* diff --git a/adapter/src/main/kotlin/ca/allanwang/kau/iitems/HeaderIItem.kt b/adapter/src/main/kotlin/ca/allanwang/kau/iitems/HeaderIItem.kt index 814d5c0..21a49f2 100644 --- a/adapter/src/main/kotlin/ca/allanwang/kau/iitems/HeaderIItem.kt +++ b/adapter/src/main/kotlin/ca/allanwang/kau/iitems/HeaderIItem.kt @@ -4,7 +4,7 @@ import android.support.v7.widget.CardView import android.support.v7.widget.RecyclerView import android.view.View import android.widget.TextView -import ca.allanwang.kau.R +import ca.allanwang.kau.adapter.R import ca.allanwang.kau.adapters.ThemableIItem import ca.allanwang.kau.adapters.ThemableIItemDelegate import ca.allanwang.kau.utils.bindView |