Merge pull request #1203 from nextcloud/fixDepVersions

Split up play services to avoid support version conflict

.drone.yml

@@ -3,7 +3,7 @@ pipeline:
     image: nextcloudci/android:android-18
     commands:
       # uncomment gplay for Gplay, Modified only
-      - sh -c "if [ '$FLAVOUR' != 'Generic' ]; then sed -i '/com.google.*.gms/s/^.*\\/\\///g' build.gradle; fi"
+      - sh -c "if [ '$FLAVOUR' != 'Generic' ]; then sed -i '/com.google.*/s/^.*\\/\\///g' build.gradle; fi"
 
       # - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M
       # - emulator -avd test -no-window &

build.gradle

@@ -30,6 +30,7 @@ configurations.all {
 
 ext {
     supportLibraryVersion = '25.0.0'
+    googleLibraryVersion = '10.2.4'
 
     travisBuild = System.getenv("TRAVIS") == "true"
 
@@ -194,7 +195,8 @@ dependencies {
     compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2'
 
     // uncomment for gplay, modified
-    //compile 'com.google.android.gms:play-services:10.2.4'
+    // compile "com.google.firebase:firebase-messaging:${googleLibraryVersion}"
+    // compile "com.google.android.gms:play-services-base:${googleLibraryVersion}"
 
     compile 'org.parceler:parceler-api:1.1.6'
     annotationProcessor 'org.parceler:parceler:1.1.6'

scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 42 errors and 780 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 41 errors and 779 warnings</span>