Merge pull request #1301 from nextcloud/firebase

Firebase

.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.*/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

@@ -203,6 +203,7 @@ dependencies {
     // uncomment for gplay, modified
     // implementation "com.google.firebase:firebase-messaging:${googleLibraryVersion}"
     // implementation "com.google.android.gms:play-services-base:${googleLibraryVersion}"
+    // implementation 'com.google.firebase:firebase-core:{googleLibraryVersion}'
     implementation 'org.parceler:parceler-api:1.1.6'
     annotationProcessor 'org.parceler:parceler:1.1.6'
     implementation 'com.github.bumptech.glide:glide:3.7.0'

scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 608 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 583 warnings</span>

src/gplay/AndroidManifest.xml

@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.owncloud.android"
-          android:versionCode="20000001"
-          android:versionName="2.0.0RC1">
+          android:versionCode="20000002"
+          android:versionName="2.0.0RC2">
 
     <application
         android:name=".MainApp"

src/main/AndroidManifest.xml

@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.owncloud.android"
-          android:versionCode="20000001"
-          android:versionName="2.0.0RC1">
+          android:versionCode="20000002"
+          android:versionName="2.0.0RC2">
 
     <uses-sdk
         android:minSdkVersion="14"

src/modified/AndroidManifest.xml

@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.owncloud.android"
-          android:versionCode="20000001"
-          android:versionName="2.0.0RC1">
+          android:versionCode="20000002"
+          android:versionName="2.0.0RC2">
 
     <application
         android:name=".MainApp"