aboutsummaryrefslogtreecommitdiff
path: root/android-lib.gradle
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-08-05 14:49:47 -0700
committerGitHub <noreply@github.com>2017-08-05 14:49:47 -0700
commitc707d42b311f96cbabc1971f98598c8b8922ba16 (patch)
tree3c592c2a8bdd2fb759e3632adf038b5d7cecfabb /android-lib.gradle
parentbafc1996d803862d30a2c7d0c402d30c79c4f647 (diff)
downloadkau-c707d42b311f96cbabc1971f98598c8b8922ba16.tar.gz
kau-c707d42b311f96cbabc1971f98598c8b8922ba16.tar.bz2
kau-c707d42b311f96cbabc1971f98598c8b8922ba16.zip
Swipe (#24)
* Test emulator * Update readme * Update fastadapter and about listing * Make faq parser asynchronous * Modularize about panels * Add basis for faq * Test and finalize the faq panel * Update readme * Update changelog * Remove emulator for now * Update sample * Change back to manual versioning to avoid suggestion errors * Add awesome-kt banner * Fix faq background color * Fix merge conflicts 2 * Add waffle badge * Update readme * Fix lint * Create FileUtils and NotificationUtils * Remove frost hardcode * Fix simple date * Update swipe to use weak references * Initializing test dependencies * Update to gradle 4.1 * Fix lint warnings * Drop back down and fix errors * Finalize swipe with example * Finalize weak reference and ordering * Update test code * Make loggers inline
Diffstat (limited to 'android-lib.gradle')
-rw-r--r--android-lib.gradle20
1 files changed, 11 insertions, 9 deletions
diff --git a/android-lib.gradle b/android-lib.gradle
index 46de84c..46b74a8 100644
--- a/android-lib.gradle
+++ b/android-lib.gradle
@@ -3,13 +3,6 @@ apply plugin: 'kotlin-android'
apply plugin: 'com.github.dcendents.android-maven'
group = project.APP_GROUP
-repositories {
- jcenter()
- mavenCentral()
- maven { url "https://jitpack.io" }
- maven { url "https://maven.google.com" }
-}
-
android {
compileSdkVersion Integer.parseInt(project.TARGET_SDK)
buildToolsVersion project.BUILD_TOOLS
@@ -27,6 +20,8 @@ android {
defaultConfig {
minSdkVersion Integer.parseInt(kauMinSdk)
targetSdkVersion Integer.parseInt(project.TARGET_SDK)
+ versionName project.VERSION_NAME
+ versionCode project.VERSION_CODE
consumerProguardFiles 'progress-proguard.txt'
multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -50,6 +45,11 @@ android {
'Overdraw'
}
+ packagingOptions {
+ pickFirst 'META-INF/core_release.kotlin_module'
+ pickFirst 'META-INF/library_release.kotlin_module'
+ }
+
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDirs += 'src/test/kotlin'
@@ -71,8 +71,10 @@ android {
}
dependencies {
- androidTestCompile 'com.android.support.test:runner:0.5'
+ androidTestCompile("com.android.support.test:runner:${TEST_RUNNER}") {
+ exclude group: 'com.android.support', module: 'support-annotations'
+ }
androidTestCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
- testCompile 'junit:junit:4.12'
+ testCompile "junit:junit:${JUNIT}"
} \ No newline at end of file