From 222b43892cd1b401eb35d2c1d0f25d611e34814a Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Mon, 23 Sep 2019 19:05:22 +0300 Subject: [PATCH] Revert irrelevant changes on build.gradle --- app/build.gradle | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fa1579169..712367720 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,14 +19,18 @@ dependencies { // Utils implementation 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07' + implementation 'com.google.code.gson:gson:2.8.5' implementation 'in.yuvi:http.fluent:1.3' implementation 'com.squareup.okhttp3:okhttp:3.12.1' implementation 'com.squareup.okio:okio:1.15.0' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' + implementation 'io.reactivex.rxjava2:rxjava:2.2.3' implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1' implementation 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.1.1' implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.1.1' implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.1.1' implementation 'com.facebook.fresco:fresco:1.13.0' + implementation 'com.drewnoakes:metadata-extractor:2.11.0' implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.18' implementation 'org.apache.commons:commons-lang3:3.8.1' @@ -45,12 +49,14 @@ dependencies { // Logging implementation 'ch.acra:acra-dialog:5.3.0' implementation 'ch.acra:acra-mail:5.3.0' + implementation 'com.jakewharton.timber:timber:4.7.1' implementation 'org.slf4j:slf4j-api:1.7.25' api('com.github.tony19:logback-android-classic:1.1.1-6') { exclude group: 'com.google.android', module: 'android' } // Dependency injector + implementation "com.google.dagger:dagger:$DAGGER_VERSION" implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION" kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION" kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION" @@ -89,10 +95,6 @@ dependencies { implementation "androidx.cardview:cardview:1.0.0" implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation "androidx.exifinterface:exifinterface:1.0.0" - - //swipe_layout - implementation 'com.daimajia.swipelayout:library:1.2.0@aar' - //metadata extractor implementation 'com.drewnoakes:metadata-extractor:2.11.0' } @@ -118,6 +120,7 @@ android { vectorDrawables.useSupportLibrary = true } + packagingOptions { exclude 'META-INF/androidx.*' exclude 'META-INF/proguard/androidx-annotations.pro' @@ -135,6 +138,7 @@ android { sourceSets { // use kotlin only in tests (for now) test.java.srcDirs += 'src/test/kotlin' + // use main assets and resources in test test.assets.srcDirs += 'src/main/assets' test.resources.srcDirs += 'src/main/resoures' @@ -206,6 +210,7 @@ android { dimension 'tier' } + beta { applicationId 'fr.free.nrw.commons.beta' @@ -251,6 +256,7 @@ android { buildToolsVersion buildToolsVersion } + if(isRunningOnTravisAndIsNotPRBuild) { play { track = "alpha" @@ -263,4 +269,4 @@ if(isRunningOnTravisAndIsNotPRBuild) { versionNameOverride = "$versionNameOverride.$versionCode" } } -} \ No newline at end of file +}