mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove automatic Gradle changes from previous commit

Browse source 
Not sure wtf happened...
This commit is contained in:
misaochan 2017-06-02 18:32:13 +10:00
parent 8e059691f9
commit 6bdd4e64c0
1 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/build.gradle
View file

@ -3,18 +3,6 @@ apply plugin: 'jacoco-android'
apply from: 'quality.gradle' apply from: 'quality.gradle'
dependencies { dependencies {
compile "com.android.support:support-v4:${project.supportLibVersion}"
compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
compile "com.android.support:design:${project.supportLibVersion}"
compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
annotationProcessor "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
compile('com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.2@aar') {
transitive = true
}
compile "com.google.guava:guava:${GUAVA_VERSION}"
androidTestCompile "com.android.support:support-annotations:${project.supportLibVersion}"
compile 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07' compile 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
compile 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar' compile 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
compile 'in.yuvi:http.fluent:1.3' compile 'in.yuvi:http.fluent:1.3'
@ -22,18 +10,27 @@ dependencies {
compile 'ch.acra:acra:4.7.0' compile 'ch.acra:acra:4.7.0'
compile 'org.mediawiki:api:1.3' compile 'org.mediawiki:api:1.3'
compile 'commons-codec:commons-codec:1.10' compile 'commons-codec:commons-codec:1.10'
compile "com.android.support:support-v4:${project.supportLibVersion}"
compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
compile "com.android.support:design:${project.supportLibVersion}"
compile 'com.google.code.gson:gson:2.7' compile 'com.google.code.gson:gson:2.7'
compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
annotationProcessor "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.jakewharton.timber:timber:4.5.1'
compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.2@aar'){
transitive=true
}
compile 'com.facebook.fresco:fresco:1.3.0' compile 'com.facebook.fresco:fresco:1.3.0'
compile 'com.facebook.stetho:stetho:1.5.0' compile 'com.facebook.stetho:stetho:1.5.0'
compile 'com.android.support:support-v4:25.3.1' compile "com.google.guava:guava:${GUAVA_VERSION}"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' androidTestCompile "com.android.support:support-annotations:${project.supportLibVersion}"
androidTestCompile ('com.android.support.test.espresso:espresso-core:2.2.2') { androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
exclude module: 'support-annotations'
}
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1' debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
} }
android { android {
@ -54,8 +51,7 @@ android {
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false // See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently - proguard.cfg modification alone insufficient.
// See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently - proguard.cfg modification alone insufficient.
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
} }
debug { debug {