diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 92cc546479348cdbe3334281f982c3bef720128b..29d18dc1094f595f742f0977b0acd2da734fe2bb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -89,7 +89,7 @@ android {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.31"))
+  implementation(kotlin("stdlib", "1.2.40"))
 
   // App Compat
   withVersion("27.1.1") {
diff --git a/app/sampledata/libraries.json b/app/sampledata/libraries.json
index f460cb3b5e1c10e39622173701b20a928d60d8b3..c457e94e3e156a4a8f528510d7862a8b778f62b9 100644
--- a/app/sampledata/libraries.json
+++ b/app/sampledata/libraries.json
@@ -100,7 +100,7 @@
     },
     {
       "name": "Kotlin Standard Library",
-      "version": "1.2.31",
+      "version": "1.2.40",
       "license": {
         "shortName": "Apache-2.0",
         "fullName": "Apache License"
@@ -152,4 +152,4 @@
       "url": "http://www.threeten.org/threetenbp/"
     }
   ]
-}
\ No newline at end of file
+}
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 136dc02dca5cc8d12b3443785400fa3b1fdabced..909b8affdfbccf8629fb91d2bb6dc30ee668586e 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
@@ -196,7 +196,7 @@ class AboutFragment : DaggerFragment() {
       ),
       Library(
         name = "Kotlin Standard Library",
-        version = "1.2.31",
+        version = "1.2.40",
         license = apache2,
         url = "https://kotlinlang.org/"
       ),
diff --git a/build.gradle.kts b/build.gradle.kts
index 19742d018e487d80b1835bc61202d58649f495cc..96bf52831a1982af1d567bf97d8a27522f36fd16 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,10 +5,7 @@ buildscript {
   }
   dependencies {
     classpath("com.android.tools.build:gradle:3.1.1")
-    withVersion("1.2.31") {
-      classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$version")
-      classpath("org.jetbrains.kotlin:kotlin-android-extensions:$version")
-    }
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.31")
   }
 }
 
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 2b649c4596d1b1ded4d4e052c6a246d0c12fe513..26b0a194753d2945d756434d0d7dffd467af7972 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.31"))
+  implementation(kotlin("stdlib", "1.2.40"))
 
   withVersion("27.1.1") {
     implementation("com.android.support", "support-annotations", version)
diff --git a/malheur/build.gradle.kts b/malheur/build.gradle.kts
index f68dd89d175b02bc15e8767b530455b76b8bd880..3cc2ebb1d184700cda7e6d1ca89f07ea5e062b57 100644
--- a/malheur/build.gradle.kts
+++ b/malheur/build.gradle.kts
@@ -17,7 +17,7 @@ android {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.31"))
+  implementation(kotlin("stdlib", "1.2.40"))
 
   implementation("com.google.code.gson", "gson", "2.8.2")
 }
diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
index bb2d425a2ffbd7569f246a418e6e40f6f25db15c..825654e510c34c59903211ac0a25ba3d6f827903 100644
--- a/persistence/build.gradle.kts
+++ b/persistence/build.gradle.kts
@@ -23,7 +23,7 @@ android {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.31"))
+  implementation(kotlin("stdlib", "1.2.40"))
 
   // App Compat
   withVersion("27.1.1") {
diff --git a/viewmodel/build.gradle.kts b/viewmodel/build.gradle.kts
index e3cca5922e6a384d3ad798e22e867b603be21b8e..5392f4479506f3286c342d5323f73641927039b4 100644
--- a/viewmodel/build.gradle.kts
+++ b/viewmodel/build.gradle.kts
@@ -17,7 +17,7 @@ android {
 }
 
 dependencies {
-  implementation(kotlin("stdlib", "1.2.31"))
+  implementation(kotlin("stdlib", "1.2.40"))
 
   // App Compat
   withVersion("27.1.1") {
@@ -25,7 +25,7 @@ dependencies {
   }
 
   // App Arch Lifecycle
-  withVersion("1.1.0") {
+  withVersion("1.1.1") {
     implementation("android.arch.lifecycle", "extensions", version)
     implementation("android.arch.lifecycle", "reactivestreams", version)
     kapt("android.arch.lifecycle", "compiler", version)