Permalink
Browse files

update dependenies

  • Loading branch information...
avalax committed Jan 7, 2018
1 parent 806aa3d commit 227d65a84e1dccd01bf827239efa7b106665a0b3
Showing with 14 additions and 14 deletions.
  1. +2 −2 .travis.yml
  2. +12 −12 build.gradle
View
@@ -5,8 +5,8 @@ android:
components:
- platform-tools
- tools
- build-tools-26.0.3
- android-26
- build-tools-27.0.3
- android-27
- sys-img-armeabi-v7a-android-19
before_script:
- ./gradlew dependencies
View
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'org.jacoco:org.jacoco.core:0.7.9'
classpath 'org.jacoco:org.jacoco.core:0.8.0'
}
}
@@ -38,12 +38,12 @@ android {
exclude 'META-INF/NOTICE'
exclude 'META-INF/services/javax.annotation.processing.Processor'
}
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "de.avalax.fitbuddy"
minSdkVersion 21
targetSdkVersion 26
targetSdkVersion 27
versionCode System.getenv("BUILD_NUMBER") as Integer ?: 0
versionName "1.0." + System.getenv("BUILD_NUMBER") as String ?: "0"
testInstrumentationRunner "de.avalax.fitbuddy.runner.MockTestRunner"
@@ -92,10 +92,10 @@ android {
}
dependencies {
implementation 'com.android.support:support-v4:26.1.0'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:cardview-v7:26.1.0'
implementation 'com.android.support:recyclerview-v7:26.1.0'
implementation 'com.android.support:support-v4:27.0.2'
implementation 'com.android.support:design:27.0.2'
implementation 'com.android.support:cardview-v7:27.0.2'
implementation 'com.android.support:recyclerview-v7:27.0.2'
implementation 'com.google.android.gms:play-services-ads:11.8.0'
implementation 'com.google.dagger:dagger:2.14.1'
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
@@ -106,13 +106,13 @@ dependencies {
testImplementation 'junit:junit:4.12'
testImplementation 'org.hamcrest:hamcrest-all:1.3'
testImplementation 'org.mockito:mockito-all:1.10.19'
testImplementation 'org.assertj:assertj-core:3.8.0'
testImplementation 'org.assertj:assertj-core:3.9.0'
testImplementation 'de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1'
testImplementation('org.robolectric:robolectric:3.5') {
testImplementation('org.robolectric:robolectric:3.6.1') {
exclude module: 'commons-logging'
exclude module: 'httpclient'
}
androidTestImplementation 'com.android.support:support-annotations:26.1.0'
androidTestImplementation 'com.android.support:support-annotations:27.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test:rules:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
@@ -128,7 +128,7 @@ dependencies {
apply plugin: 'jacoco'
jacoco {
toolVersion = "0.7.9"
toolVersion = "0.8.0"
}
task jacocoCombinedTestReport(type: JacocoReport, dependsOn: ['jacocoTestReport', 'createDebugCoverageReport']) {

0 comments on commit 227d65a

Please sign in to comment.