From 8962f9fa548997043b191e82ae9ae110171aa5a6 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Thu, 26 Oct 2017 11:26:48 +0300
Subject: [PATCH] Up Gradle Plugin and Firebase Disabled Firebase for Debug
 build (also removed associated google-services.json)

---
 .gitignore                                    |  4 +-
 app/build.gradle                              |  8 ++--
 app/src/debug/google-services.json            | 42 -------------------
 .../mthmmy/services/DownloadService.java      |  1 -
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 6 files changed, 10 insertions(+), 51 deletions(-)
 delete mode 100644 app/src/debug/google-services.json

diff --git a/.gitignore b/.gitignore
index 252008e0..8df35eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,5 +46,5 @@ captures/
 ### Android Patch ###
 gen-external-apklibs
 
-# Google Services (release build)
-app/src/release/google-services.json
\ No newline at end of file
+# Google Services JSON
+google-services.json
diff --git a/app/build.gradle b/app/build.gradle
index 7e887fc8..97ae004b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         /*debug {
-            def date = new Date().format('ddMMyy_HH');
+            def date = new Date().format('ddMMyy_HHmmss');
             archivesBaseName = archivesBaseName + "-$date"
         }*/
     }
@@ -33,7 +33,7 @@ dependencies {
     compile 'com.android.support:support-v4:26.1.0'
     compile 'com.android.support:cardview-v7:26.1.0'
     compile 'com.android.support:recyclerview-v7:26.1.0'
-    compile 'com.google.firebase:firebase-crash:10.2.6'
+    compile 'com.google.firebase:firebase-crash:11.4.2'
     compile 'com.squareup.okhttp3:okhttp:3.9.0'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
@@ -50,4 +50,6 @@ dependencies {
     compile 'com.jakewharton.timber:timber:4.5.1'
 }
 
-apply plugin: 'com.google.gms.google-services'
+if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Debug")){
+    apply plugin: 'com.google.gms.google-services'
+}
diff --git a/app/src/debug/google-services.json b/app/src/debug/google-services.json
deleted file mode 100644
index c6718eaa..00000000
--- a/app/src/debug/google-services.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "project_info": {
-    "project_number": "934432863001",
-    "firebase_url": "https://mthmmy-debug.firebaseio.com",
-    "project_id": "mthmmy-debug",
-    "storage_bucket": "mthmmy-debug.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:934432863001:android:088be0537ff6b292",
-        "android_client_info": {
-          "package_name": "gr.thmmy.mthmmy"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "934432863001-d5oocs1vdi0pcepesi55a41p7enphfcv.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyD4-gwVcb2Rc8zeT8l1v2Lg1DU0QgfGtk8"
-        }
-      ],
-      "services": {
-        "analytics_service": {
-          "status": 1
-        },
-        "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 2
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java b/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
index 41a65957..a00cffb0 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Environment;
 import android.support.annotation.NonNull;
-import android.util.Log;
 import android.webkit.MimeTypeMap;
 
 import java.io.File;
diff --git a/build.gradle b/build.gradle
index 41691e53..b70b93b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'com.google.gms:google-services:3.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8b6dacea..9a77e6f4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 08 11:25:21 EET 2017
+#Thu Oct 26 11:21:06 EEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip