From f8d73dd5e67a82aea4d4249aeffd233f137be505 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 20 Apr 2018 01:53:32 +0200
Subject: [PATCH] Dependencies upgraded
---
app/build.gradle.kts | 2 +-
app/sampledata/libraries.json | 4 ++--
.../quasseldroid/ui/clientsettings/about/AboutFragment.kt | 2 +-
build.gradle.kts | 5 +----
lib/build.gradle.kts | 2 +-
malheur/build.gradle.kts | 2 +-
persistence/build.gradle.kts | 2 +-
viewmodel/build.gradle.kts | 4 ++--
8 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 92cc54647..29d18dc10 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 f460cb3b5..c457e94e3 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 136dc02dc..909b8affd 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 19742d018..96bf52831 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 2b649c459..26b0a1947 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 f68dd89d1..3cc2ebb1d 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 bb2d425a2..825654e51 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 e3cca5922..5392f4479 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)
--
GitLab