From 89feff859bcc478f99c92e86143beffe35c55f23 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 8 Aug 2018 09:06:14 +0200
Subject: [PATCH] Updated kotlin

---
 app/build.gradle.kts                                          | 2 +-
 app/sampledata/libraries.json                                 | 2 +-
 .../quasseldroid/ui/clientsettings/about/AboutFragment.kt     | 2 +-
 build.gradle.kts                                              | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                      | 2 +-
 lib/build.gradle.kts                                          | 2 +-
 lifecycle-ktx/build.gradle.kts                                | 2 +-
 malheur/build.gradle.kts                                      | 2 +-
 persistence/build.gradle.kts                                  | 2 +-
 viewmodel/build.gradle.kts                                    | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8299e64eb..8f052b42f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -110,7 +110,7 @@ android {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.51"))
+  implementation(kotlin("stdlib", "1.2.60"))
 
   // App Compat
   withVersion("27.1.1") {
diff --git a/app/sampledata/libraries.json b/app/sampledata/libraries.json
index 22490ae5d..d2886bada 100644
--- a/app/sampledata/libraries.json
+++ b/app/sampledata/libraries.json
@@ -161,7 +161,7 @@
     },
     {
       "name": "Kotlin Standard Library",
-      "version": "1.2.51",
+      "version": "1.2.60",
       "license": {
         "short_name": "Apache-2.0",
         "full_name": "Apache License"
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
index 4611a1feb..18aded090 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
@@ -227,7 +227,7 @@ class AboutFragment : DaggerFragment() {
       ),
       Library(
         name = "Kotlin Standard Library",
-        version = "1.2.51",
+        version = "1.2.60",
         license = apache2,
         url = "https://kotlinlang.org/"
       ),
diff --git a/build.gradle.kts b/build.gradle.kts
index d5c316a7c..fa37a4fd2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,8 +23,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath("com.android.tools.build:gradle:3.1.3")
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.51")
+    classpath("com.android.tools.build:gradle:3.1.4")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
   }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 91e8cf2c4..dff81a467 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -18,5 +18,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.8-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-4.9-all.zip
 
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 1fb6ecc29..90f914790 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -29,7 +29,7 @@ plugins {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.51"))
+  implementation(kotlin("stdlib", "1.2.60"))
 
   withVersion("27.1.1") {
     implementation("com.android.support", "support-annotations", version)
diff --git a/lifecycle-ktx/build.gradle.kts b/lifecycle-ktx/build.gradle.kts
index 5686bb4e6..ad25f2c8c 100644
--- a/lifecycle-ktx/build.gradle.kts
+++ b/lifecycle-ktx/build.gradle.kts
@@ -27,7 +27,7 @@ plugins {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.51"))
+  implementation(kotlin("stdlib", "1.2.60"))
 
   withVersion("27.1.1") {
     implementation("com.android.support", "support-annotations", version)
diff --git a/malheur/build.gradle.kts b/malheur/build.gradle.kts
index 83cce734e..c65eb038a 100644
--- a/malheur/build.gradle.kts
+++ b/malheur/build.gradle.kts
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.51"))
+  implementation(kotlin("stdlib", "1.2.60"))
 
   implementation("com.google.code.gson", "gson", "2.8.2")
 }
diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
index 9838a3e8b..614ebeacb 100644
--- a/persistence/build.gradle.kts
+++ b/persistence/build.gradle.kts
@@ -52,7 +52,7 @@ android {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.51"))
+  implementation(kotlin("stdlib", "1.2.60"))
 
   // App Compat
   withVersion("27.1.1") {
diff --git a/viewmodel/build.gradle.kts b/viewmodel/build.gradle.kts
index 4f7be5fd7..5fee6aae2 100644
--- a/viewmodel/build.gradle.kts
+++ b/viewmodel/build.gradle.kts
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.51"))
+  implementation(kotlin("stdlib", "1.2.60"))
 
   // App Compat
   withVersion("27.1.1") {
-- 
GitLab