From ef7b8f82fa9f83ed9f7f48554d144849c09956a1 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sun, 14 Sep 2014 22:19:56 -0400 Subject: [PATCH] Remove Hugo, it keeps on breaking the build... --- app/build.gradle | 10 ++-------- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4a4f60d..7a10c38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,14 +7,12 @@ buildscript { dependencies { classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.jakewharton.hugo:hugo-plugin:+' } } apply plugin: 'android-sdk-manager' apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'hugo' android { compileSdkVersion 20 @@ -44,15 +42,14 @@ android { exclude 'NOTICE' exclude 'asm-license.txt' } - // TODO: Remove Hugo and support SDK 8? productFlavors { testConfig { - minSdkVersion 9 + minSdkVersion 8 applicationId 'org.bspeice.minimalbible' targetSdkVersion 20 } mainConfig { - minSdkVersion 9 + minSdkVersion 8 applicationId 'org.bspeice.minimalbible' targetSdkVersion 20 } @@ -60,9 +57,6 @@ android { sourceSets { main.java.srcDirs += 'src/main/kotlin' } - lintOptions { - disable 'adviceDidNotMatch' - } } dependencies { diff --git a/gradle.properties b/gradle.properties index 2833ad9..5d08ba7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit