Skip to content

Commit

Permalink
jacoco 0.8.1, dagger 2.15, proguard config
Browse files Browse the repository at this point in the history
  • Loading branch information
avalax committed Apr 3, 2018
1 parent 5b58357 commit da3c3a8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 95 deletions.
11 changes: 5 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'org.jacoco:org.jacoco.core:0.8.0'
classpath 'org.jacoco:org.jacoco.core:0.8.1'
}
}

Expand Down Expand Up @@ -84,7 +84,6 @@ android {
debuggable false
minifyEnabled true
zipAlignEnabled true
proguardFiles "proguard.cfg"
signingConfig signingConfigs.release
}
}
Expand All @@ -97,11 +96,11 @@ dependencies {
implementation 'com.android.support:cardview-v7:27.1.0'
implementation 'com.android.support:recyclerview-v7:27.1.0'
implementation 'com.google.android.gms:play-services-ads:12.0.1'
implementation 'com.google.dagger:dagger:2.14.1'
implementation 'com.google.dagger:dagger:2.15'
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'

annotationProcessor 'com.google.dagger:dagger-compiler:2.14.1'
androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.14.1'
annotationProcessor 'com.google.dagger:dagger-compiler:2.15'
androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.15'

testImplementation 'junit:junit:4.12'
testImplementation 'org.hamcrest:hamcrest-all:1.3'
Expand All @@ -128,7 +127,7 @@ dependencies {
apply plugin: 'jacoco'

jacoco {
toolVersion = "0.8.0"
toolVersion = "0.8.1"
}

task jacocoCombinedTestReport(type: JacocoReport, dependsOn: ['jacocoTestReport', 'createDebugCoverageReport']) {
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
# VersionEye project ID added by Gradle VersionEye plugin
versioneye.projectid=56d966523225f30037816a13
android.builder.sdkDownload=true

proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt
89 changes: 0 additions & 89 deletions proguard.cfg

This file was deleted.

0 comments on commit da3c3a8

Please sign in to comment.