Skip to content

Commit

Permalink
support 27.1.1 & gradle parrallel build
Browse files Browse the repository at this point in the history
  • Loading branch information
avalax committed Apr 5, 2018
1 parent f996b5e commit da16c59
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ android {
}

dependencies {
implementation 'com.android.support:support-v4:27.1.0'
implementation 'com.android.support:design:27.1.0'
implementation 'com.android.support:cardview-v7:27.1.0'
implementation 'com.android.support:recyclerview-v7:27.1.0'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
implementation 'com.google.android.gms:play-services-ads:12.0.1'
implementation 'com.google.dagger:dagger:2.15'
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
Expand All @@ -111,7 +111,7 @@ dependencies {
exclude module: 'commons-logging'
exclude module: 'httpclient'
}
androidTestImplementation 'com.android.support:support-annotations:27.1.0'
androidTestImplementation 'com.android.support:support-annotations:27.1.1'
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'
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
versioneye.projectid=56d966523225f30037816a13
android.builder.sdkDownload=true

proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt
proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt

org.gradle.daemon=true
org.gradle.parallel=true

0 comments on commit da16c59

Please sign in to comment.