From 0898b559ed7a77cd3d99684e438cd88d68335a60 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 11 Apr 2019 20:15:54 +0200
Subject: [PATCH] Updated Kotlin
---
app/build.gradle.kts | 2 +-
.../ui/clientsettings/about/AboutFragment.kt | 2 +-
build.gradle.kts | 2 +-
desktop/build.gradle.kts | 2 +-
invokergenerator/build.gradle.kts | 10 ++++++++--
lib/build.gradle.kts | 2 +-
lifecycle-ktx/build.gradle.kts | 2 +-
malheur/build.gradle.kts | 2 +-
persistence/build.gradle.kts | 2 +-
ui_spinner/build.gradle.kts | 2 +-
viewmodel/build.gradle.kts | 2 +-
11 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 74cf763ff..ab8a77718 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -101,7 +101,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.21"))
+ implementation(kotlin("stdlib", "1.3.30"))
// App Compat
implementation("com.google.android.material", "material", "1.1.0-alpha04")
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 8977f4d0b..095d93d11 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
@@ -198,7 +198,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "Kotlin Standard Library",
- version = "1.3.21",
+ version = "1.3.30",
license = apache2,
url = "https://kotlinlang.org/"
),
diff --git a/build.gradle.kts b/build.gradle.kts
index 7424b6f4d..6ce608539 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,7 +26,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:3.3.2")
- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21")
+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.30")
}
}
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index 6c7d2eda5..4ece35290 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -28,7 +28,7 @@ application {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.21"))
+ implementation(kotlin("stdlib", "1.3.30"))
implementation("io.reactivex.rxjava2", "rxjava", "2.1.9")
implementation("info.picocli", "picocli", "3.9.0")
diff --git a/invokergenerator/build.gradle.kts b/invokergenerator/build.gradle.kts
index 3b6813c4a..0235cabef 100644
--- a/invokergenerator/build.gradle.kts
+++ b/invokergenerator/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
/*
* Quasseldroid - Quassel client for Android
*
@@ -22,10 +24,14 @@ plugins {
kotlin("kapt")
}
+tasks.withType<KotlinCompile> {
+ kotlinOptions.jvmTarget = "1.8"
+}
+
dependencies {
- implementation(kotlin("stdlib", "1.3.21"))
+ implementation(kotlin("stdlib", "1.3.30"))
implementation(project(":invokerannotations"))
- implementation("org.jetbrains.kotlin", "kotlin-compiler-embeddable", "1.3.21")
+ implementation("org.jetbrains.kotlin", "kotlin-compiler-embeddable", "1.3.30")
implementation("com.squareup", "kotlinpoet", "1.1.0")
implementation("com.google.auto.service:auto-service:1.0-rc4")
kapt("com.google.auto.service:auto-service:1.0-rc4")
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 698a5e8af..d3f5104e2 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.21"))
+ implementation(kotlin("stdlib", "1.3.30"))
implementation("androidx.annotation", "annotation", "1.0.0")
diff --git a/lifecycle-ktx/build.gradle.kts b/lifecycle-ktx/build.gradle.kts
index ddeaa316f..67735118d 100644
--- a/lifecycle-ktx/build.gradle.kts
+++ b/lifecycle-ktx/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.21"))
+ implementation(kotlin("stdlib", "1.3.30"))
implementation("androidx.annotation", "annotation", "1.0.0")
diff --git a/malheur/build.gradle.kts b/malheur/build.gradle.kts
index ec51428a0..5b48600e3 100644
--- a/malheur/build.gradle.kts
+++ b/malheur/build.gradle.kts
@@ -44,7 +44,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.21"))
+ implementation(kotlin("stdlib", "1.3.30"))
implementation("com.google.code.gson", "gson", "2.8.5")
}
diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
index 4baf972bd..6a0bdbf59 100644
--- a/persistence/build.gradle.kts
+++ b/persistence/build.gradle.kts
@@ -51,7 +51,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.21"))
+ implementation(kotlin("stdlib", "1.3.30"))
implementation("androidx.appcompat", "appcompat", "1.0.0")
diff --git a/ui_spinner/build.gradle.kts b/ui_spinner/build.gradle.kts
index ab7c81262..5cb1d87dc 100644
--- a/ui_spinner/build.gradle.kts
+++ b/ui_spinner/build.gradle.kts
@@ -44,6 +44,6 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.21"))
+ implementation(kotlin("stdlib", "1.3.30"))
implementation("androidx.appcompat", "appcompat", "1.0.0")
}
diff --git a/viewmodel/build.gradle.kts b/viewmodel/build.gradle.kts
index 581299a8c..01954e17b 100644
--- a/viewmodel/build.gradle.kts
+++ b/viewmodel/build.gradle.kts
@@ -44,7 +44,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.21"))
+ implementation(kotlin("stdlib", "1.3.30"))
implementation("androidx.appcompat", "appcompat", "1.0.0")
withVersion("2.0.0") {
--
GitLab