Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(build-tools): Build tools missing #293

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildsystem/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ allprojects {

ext {
//Android
androidBuildToolsVersion = "24.0.1"
androidBuildToolsVersion = '24.0.1'
androidMinSdkVersion = 15
androidTargetSdkVersion = 21
androidCompileSdkVersion = 21
Expand Down
95 changes: 48 additions & 47 deletions data/build.gradle
Original file line number Diff line number Diff line change
@@ -1,67 +1,68 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'me.tatarka:gradle-retrolambda:3.2.3'
}
repositories {
mavenCentral()
}
dependencies {
classpath 'me.tatarka:gradle-retrolambda:3.2.3'
}
}

apply plugin: 'com.android.library'
apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'me.tatarka.retrolambda'

android {
defaultPublishConfig "debug"
defaultPublishConfig "debug"

def globalConfiguration = rootProject.extensions.getByName("ext")
def globalConfiguration = rootProject.extensions.getByName("ext")

compileSdkVersion globalConfiguration.getAt("androidCompileSdkVersion")
buildToolsVersion globalConfiguration.getAt("androidBuildToolsVersion")
compileSdkVersion globalConfiguration.getAt("androidCompileSdkVersion")
buildToolsVersion = globalConfiguration["androidBuildToolsVersion"]

defaultConfig {
minSdkVersion globalConfiguration.getAt("androidMinSdkVersion")
targetSdkVersion globalConfiguration.getAt("androidTargetSdkVersion")
versionCode globalConfiguration.getAt("androidVersionCode")
}
defaultConfig {
minSdkVersion globalConfiguration.getAt("androidMinSdkVersion")
targetSdkVersion globalConfiguration.getAt("androidTargetSdkVersion")
versionCode globalConfiguration.getAt("androidVersionCode")
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

packagingOptions {
exclude 'LICENSE.txt'
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/ASL2.0'
exclude 'META-INF/NOTICE'
exclude 'META-INF/LICENSE'
}
packagingOptions {
exclude 'LICENSE.txt'
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/ASL2.0'
exclude 'META-INF/NOTICE'
exclude 'META-INF/LICENSE'
}

lintOptions {
quiet true
abortOnError false
ignoreWarnings true
disable 'InvalidPackage' // Some libraries have issues with this
disable 'OldTargetApi' // Due to Robolectric that modifies the manifest when running tests
}
lintOptions {
quiet true
abortOnError false
ignoreWarnings true
disable 'InvalidPackage' // Some libraries have issues with this
disable 'OldTargetApi'
// Due to Robolectric that modifies the manifest when running tests
}
}

dependencies {
def dataDependencies = rootProject.ext.dataDependencies
def testDependencies = rootProject.ext.dataTestDependencies
def dataDependencies = rootProject.ext.dataDependencies
def testDependencies = rootProject.ext.dataTestDependencies

compile project(':domain')
provided dataDependencies.javaxAnnotation
compile dataDependencies.javaxInject
compile dataDependencies.okHttp
compile dataDependencies.gson
compile dataDependencies.rxJava
compile dataDependencies.rxAndroid
compile dataDependencies.androidAnnotations
compile project(':domain')
provided dataDependencies.javaxAnnotation
compile dataDependencies.javaxInject
compile dataDependencies.okHttp
compile dataDependencies.gson
compile dataDependencies.rxJava
compile dataDependencies.rxAndroid
compile dataDependencies.androidAnnotations

testCompile testDependencies.junit
testCompile testDependencies.assertj
testCompile testDependencies.mockito
testCompile testDependencies.robolectric
testCompile testDependencies.junit
testCompile testDependencies.assertj
testCompile testDependencies.mockito
testCompile testDependencies.robolectric
}
2 changes: 1 addition & 1 deletion presentation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android {
def globalConfiguration = rootProject.extensions.getByName("ext")

compileSdkVersion globalConfiguration.getAt("androidCompileSdkVersion")
buildToolsVersion globalConfiguration.getAt("androidBuildToolsVersion")
buildToolsVersion = globalConfiguration["androidBuildToolsVersion"]

defaultConfig {
minSdkVersion globalConfiguration.getAt("androidMinSdkVersion")
Expand Down