From ea7dc5c87766add7ab5c79485b8e98210f466875 Mon Sep 17 00:00:00 2001
From: DanGdl <dan@superup.me>
Date: Thu, 17 Oct 2019 19:38:57 +0300
Subject: [PATCH] # gradle and libs update

---
 .gitignore                                               | 1 +
 app/build.gradle                                         | 2 +-
 app/src/main/java/com/mdgd/j_commons/dto/Quake.kt        | 2 --
 app/src/main/java/com/mdgd/j_commons/dto/SearchParams.kt | 4 +---
 build.gradle                                             | 8 ++++----
 gradle/wrapper/gradle-wrapper.properties                 | 4 ++--
 result/build.gradle                                      | 1 -
 retrofit_support/build.gradle                            | 1 -
 8 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39b6783..c298eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ captures/
 
 # IntelliJ
 *.iml
+.idea/
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
index 30fdf83..398e6b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     implementation project(':retrofit_support')
 
     // kotlin
-    implementation "androidx.core:core-ktx:1.0.2"
+    implementation "androidx.core:core-ktx:1.1.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
diff --git a/app/src/main/java/com/mdgd/j_commons/dto/Quake.kt b/app/src/main/java/com/mdgd/j_commons/dto/Quake.kt
index 5247b37..f42f6ad 100644
--- a/app/src/main/java/com/mdgd/j_commons/dto/Quake.kt
+++ b/app/src/main/java/com/mdgd/j_commons/dto/Quake.kt
@@ -44,6 +44,4 @@ class Quake {
         result = 31 * result + (title?.hashCode() ?: 0)
         return result
     }
-
-
 }
diff --git a/app/src/main/java/com/mdgd/j_commons/dto/SearchParams.kt b/app/src/main/java/com/mdgd/j_commons/dto/SearchParams.kt
index 55226a8..6adab85 100644
--- a/app/src/main/java/com/mdgd/j_commons/dto/SearchParams.kt
+++ b/app/src/main/java/com/mdgd/j_commons/dto/SearchParams.kt
@@ -15,10 +15,8 @@ class SearchParams(val query: String = "", val stDate: Long = DEF_TIME,
         get() = (TextUtils.isEmpty(query) && stDate == DEF_TIME
                 && TextUtils.isEmpty(stMag) && endDate == -DEF_TIME && TextUtils.isEmpty(endMag))
 
-    fun isRegular(): Boolean {
-        return (TextUtils.isEmpty(query) && stDate != DEF_TIME
+    fun isRegular(): Boolean = (TextUtils.isEmpty(query) && stDate != DEF_TIME
                 && TextUtils.isEmpty(stMag) && endDate == DEF_TIME && TextUtils.isEmpty(endMag))
-    }
 
     companion object {
         const val DEF_TIME = -1L
diff --git a/build.gradle b/build.gradle
index fedf6f9..78f0144 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
     ext.support_ver = '28.0.0'
-    ext.gcm_ver = '16.1.0'
+    ext.gcm_ver = '17.0.0'
     ext.retrofit_ver = '2.4.0'
-    ext.androidx = '1.0.2'
+    ext.androidx = '1.1.0'
     ext.androidx_recycler = '1.0.0'
     project.ext {
         min_ver = 17
@@ -21,7 +21,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a278858..ea42476 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 11 17:49:30 IDT 2019
+#Thu Oct 17 19:27:19 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/result/build.gradle b/result/build.gradle
index a0b24e3..d4e861c 100644
--- a/result/build.gradle
+++ b/result/build.gradle
@@ -21,7 +21,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {}
diff --git a/retrofit_support/build.gradle b/retrofit_support/build.gradle
index 303a30e..91b91f4 100644
--- a/retrofit_support/build.gradle
+++ b/retrofit_support/build.gradle
@@ -19,7 +19,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {