Remove Hugo, it keeps on breaking the build...

This commit is contained in:
Bradlee Speice 2014-09-14 22:19:56 -04:00
parent df5700107d
commit ef7b8f82fa
2 changed files with 3 additions and 9 deletions

View File

@ -7,14 +7,12 @@ buildscript {
dependencies { dependencies {
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jakewharton.hugo:hugo-plugin:+'
} }
} }
apply plugin: 'android-sdk-manager' apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'hugo'
android { android {
compileSdkVersion 20 compileSdkVersion 20
@ -44,15 +42,14 @@ android {
exclude 'NOTICE' exclude 'NOTICE'
exclude 'asm-license.txt' exclude 'asm-license.txt'
} }
// TODO: Remove Hugo and support SDK 8?
productFlavors { productFlavors {
testConfig { testConfig {
minSdkVersion 9 minSdkVersion 8
applicationId 'org.bspeice.minimalbible' applicationId 'org.bspeice.minimalbible'
targetSdkVersion 20 targetSdkVersion 20
} }
mainConfig { mainConfig {
minSdkVersion 9 minSdkVersion 8
applicationId 'org.bspeice.minimalbible' applicationId 'org.bspeice.minimalbible'
targetSdkVersion 20 targetSdkVersion 20
} }
@ -60,9 +57,6 @@ android {
sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'
} }
lintOptions {
disable 'adviceDidNotMatch'
}
} }
dependencies { dependencies {

View File

@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m # 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. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit