Merge branch 'master' into #136

app/build.gradle

@@ -7,19 +7,11 @@ android {
         applicationId "com.keylesspalace.tusky"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 16
-        versionName "1.1.3"
+        versionCode 17
+        versionName "1.1.4-beta.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary true
     }
-    productFlavors {
-        google {
-            buildConfigField "boolean", "USES_PUSH_NOTIFICATIONS", "true"
-        }
-        fdroid {
-            buildConfigField "boolean", "USES_PUSH_NOTIFICATIONS", "false"
-        }
-    }
     buildTypes {
         release {
             minifyEnabled true
@@ -53,17 +45,16 @@ dependencies {
     compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
     compile 'com.pkmmte.view:circularimageview:1.1'
     compile 'com.github.varunest:sparkbutton:1.0.5'
-    compile 'com.mikhaellopez:circularfillableloaders:1.2.0'
     compile 'com.github.chrisbanes:PhotoView:2.0.0'
     compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar'
     compile 'com.github.arimorty:floatingsearchview:2.0.4'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.4.3'
     compile 'com.jakewharton:butterknife:8.5.1'
     compile 'org.jsoup:jsoup:1.10.2'
-    googleCompile 'com.google.firebase:firebase-messaging:10.2.4'
-    googleCompile 'com.google.firebase:firebase-crash:10.2.4'
+    compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
+    compile('org.eclipse.paho:org.eclipse.paho.android.service:1.1.1') {
+        exclude module: 'support-v4'
+    }
     testCompile 'junit:junit:4.12'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
 }
-
-apply plugin: 'com.google.gms.google-services'