fixed some merge derps

This commit is contained in:
2017-01-31 16:30:22 +01:00
parent 23035084e8
commit 96a0bf9ed4

View File

@@ -36,7 +36,6 @@ apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'
apply plugin: 'com.jakewharton.hugo'
apply plugin: 'com.github.ben-manes.versions'
apply plugin: 'com.neenbedankt.android-apt'
repositories {
maven { url "https://jitpack.io" }
@@ -59,6 +58,7 @@ android {
versionName "1.0.4-SNAPSHOT"
archivesBaseName = "LedD-" + versionName + "-" + versionCode
manifestPlaceholders = [HOCKEYAPP_APP_ID: "7febd1d2266a4f0c81667ca4e3d11fd3"]
jackOptions.enabled true
}
buildTypes {
@@ -84,7 +84,7 @@ dependencies {
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:support-v4:25.1.1'
compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'com.jakewharton.timber:timber:4.1.2'
compile 'com.jakewharton.timber:timber:4.5.1'
compile 'com.google.code.gson:gson:2.8.0'
compile 'com.jakewharton:butterknife:8.5.1'
compile 'com.koushikdutta.async:androidasync:2.1.9'