diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 51f330b94db3f5ad2f39b1e5799dd7fa2a21e9bf..43a930eb80a3b2f16440e8969969deafa4681adc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -88,7 +88,7 @@ android {
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
- setTargetCompatibility(JavaVersion.VERSION_1_8)
+ targetCompatibility = JavaVersion.VERSION_1_8
}
testOptions {
@@ -102,29 +102,30 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.30"))
+ implementation(kotlin("stdlib", "1.3.41"))
// App Compat
- implementation("com.google.android.material", "material", "1.1.0-alpha04")
+ implementation("com.google.android.material", "material", "1.1.0-alpha07")
- implementation("androidx.appcompat", "appcompat", "1.0.0")
+ implementation("androidx.appcompat", "appcompat", "1.0.2")
implementation("androidx.browser", "browser", "1.0.0")
implementation("androidx.cardview", "cardview", "1.0.0")
implementation("androidx.recyclerview", "recyclerview", "1.0.0")
implementation("androidx.preference", "preference", "1.0.0")
implementation("androidx.legacy", "legacy-preference-v14", "1.0.0")
- implementation("androidx.constraintlayout", "constraintlayout", "1.1.2")
+ implementation("androidx.constraintlayout", "constraintlayout", "1.1.3")
- withVersion("2.0.0") {
+ withVersion("2.1.0") {
implementation("androidx.room", "room-runtime", version)
kapt("androidx.room", "room-compiler", version)
implementation("androidx.room", "room-rxjava2", version)
testImplementation("androidx.room", "room-testing", version)
-
+ }
+ withVersion("2.0.0") {
implementation("androidx.lifecycle", "lifecycle-extensions", version)
implementation("androidx.lifecycle", "lifecycle-reactivestreams", version)
- testImplementation("androidx.arch.core", "core-testing", version)
}
+ testImplementation("androidx.arch.core", "core-testing", "2.0.1")
implementation(project(":lifecycle-ktx"))
implementation("androidx.paging", "paging-runtime", "2.1.0")
@@ -132,15 +133,15 @@ dependencies {
implementation("androidx.multidex", "multidex", "2.0.1")
// Utility
- implementation("io.reactivex.rxjava2", "rxandroid", "2.0.2")
- implementation("io.reactivex.rxjava2", "rxjava", "2.1.9")
- implementation("org.threeten", "threetenbp", "1.3.8", classifier = "no-tzdb")
+ implementation("io.reactivex.rxjava2", "rxandroid", "2.1.1")
+ implementation("io.reactivex.rxjava2", "rxjava", "2.2.10")
+ implementation("org.threeten", "threetenbp", "1.4.0", classifier = "no-tzdb")
implementation("org.jetbrains", "annotations", "17.0.0")
implementation("com.google.code.gson", "gson", "2.8.5")
implementation("commons-codec", "commons-codec", "1.12")
- implementation("com.squareup.retrofit2", "retrofit", "2.5.0")
- implementation("com.squareup.retrofit2", "converter-gson", "2.5.0")
- implementation("com.github.pwittchen", "reactivenetwork-rx2", "3.0.2")
+ implementation("com.squareup.retrofit2", "retrofit", "2.6.0")
+ implementation("com.squareup.retrofit2", "converter-gson", "2.6.0")
+ implementation("com.github.pwittchen", "reactivenetwork-rx2", "3.0.3")
withVersion("10.1.0") {
implementation("com.jakewharton", "butterknife", version)
kapt("com.jakewharton", "butterknife-compiler", version)
@@ -178,7 +179,7 @@ dependencies {
}
// Dependency Injection
- withVersion("2.21") {
+ withVersion("2.23.2") {
implementation("com.google.dagger", "dagger", version)
kapt("com.google.dagger", "dagger-compiler", version)
kapt("com.google.dagger", "dagger-android-processor", version)
@@ -187,14 +188,14 @@ dependencies {
}
testImplementation("junit", "junit", "4.12")
- testImplementation("org.robolectric", "robolectric", "4.2") {
+ testImplementation("org.robolectric", "robolectric", "4.3") {
exclude(group = "org.threeten", module = "threetenbp")
}
androidTestImplementation("junit", "junit", "4.12")
androidTestImplementation("androidx.test.espresso", "espresso-core", "3.1.0")
androidTestImplementation("androidx.test.espresso", "espresso-contrib", "3.1.0")
- androidTestImplementation("androidx.test.ext", "junit", "1.1.0")
- androidTestImplementation("androidx.test", "runner", "1.1.0")
- androidTestImplementation("androidx.test", "rules", "1.1.0")
+ androidTestImplementation("androidx.test.ext", "junit", "1.2.0")
+ androidTestImplementation("androidx.test", "runner", "1.2.0")
+ androidTestImplementation("androidx.test", "rules", "1.2.0")
}
diff --git a/app/sampledata/libraries.json b/app/sampledata/libraries.json
index 8b776f74bd00a47f875a5e0703971f40acf0d962..2158ebce1ffae002e077d069c940da716d2e9247 100644
--- a/app/sampledata/libraries.json
+++ b/app/sampledata/libraries.json
@@ -240,7 +240,7 @@
},
{
"name": "ThreeTen backport project",
- "version": "1.3.6",
+ "version": "1.4.0",
"license": {
"short_name": "BSD 3-clause"
},
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 53a3b6db48603009f35a2c38fffc60f9720cef85..8f2f43b646e351dff25dd7c41f912fbffc1685c3 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
@@ -132,7 +132,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "AutoService",
- version = "1.0-rc4",
+ version = "1.0-rc6",
license = apache2,
url = "https://github.com/google/auto/tree/master/service"
),
@@ -150,7 +150,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "Dagger 2",
- version = "2.21",
+ version = "2.23.2",
license = apache2,
url = "https://google.github.io/dagger/"
),
@@ -186,7 +186,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "KotlinPoet",
- version = "1.1.0",
+ version = "1.3.0",
license = apache2,
url = "https://github.com/square/kotlinpoet"
),
@@ -198,7 +198,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "Kotlin Standard Library",
- version = "1.3.30",
+ version = "1.3.41",
license = apache2,
url = "https://kotlinlang.org/"
),
@@ -235,7 +235,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "MaterialProgressBar",
- version = "1.4.2",
+ version = "1.6.1",
license = apache2,
url = "https://github.com/DreaminginCodeZH/MaterialProgressBar"
),
@@ -267,13 +267,13 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "Retrofit",
- version = "2.5.0",
+ version = "2.6.0",
license = apache2,
url = "https://square.github.io/retrofit/"
),
Library(
name = "RxJava",
- version = "2.1.9",
+ version = "2.2.10",
license = apache2,
url = "https://github.com/ReactiveX/RxJava"
),
@@ -288,7 +288,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "ThreeTen backport project",
- version = "1.3.8",
+ version = "1.4.10",
license = License(
shortName = "BSD 3-clause",
text = R.raw.license_threetenbp
diff --git a/build.gradle.kts b/build.gradle.kts
index 1b18f7146f9de9cf4beb6387f7da1876ad60b680..4c1e35780cef116dee8cad8bdd47ca33dc5eb6a9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,7 +26,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:3.4.1")
- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.30")
+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41")
}
}
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index 01b77090a3fb977b417022c139334066ee0cc9e1..4d6e52fd3716d5242bb21fcb89b6dc774a5376c0 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -28,9 +28,9 @@ application {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.30"))
+ implementation(kotlin("stdlib", "1.3.41"))
- implementation("io.reactivex.rxjava2", "rxjava", "2.1.9")
+ implementation("io.reactivex.rxjava2", "rxjava", "2.2.10")
implementation("info.picocli", "picocli", "3.9.0")
implementation(project(":lib"))
diff --git a/invokergenerator/build.gradle.kts b/invokergenerator/build.gradle.kts
index 6af7e0c76df20c763ccf5bad551cf2e18bfc6764..42057b9b1880d74dad771aa757a91fbdf425e034 100644
--- a/invokergenerator/build.gradle.kts
+++ b/invokergenerator/build.gradle.kts
@@ -29,10 +29,10 @@ tasks.withType<KotlinCompile> {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.30"))
+ implementation(kotlin("stdlib", "1.3.41"))
implementation(project(":invokerannotations"))
- 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")
+ implementation("org.jetbrains.kotlin", "kotlin-compiler-embeddable", "1.3.41")
+ implementation("com.squareup", "kotlinpoet", "1.3.0")
+ implementation("com.google.auto.service:auto-service:1.0-rc6")
+ kapt("com.google.auto.service:auto-service:1.0-rc6")
}
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 3349122a733d1da98d61b038dc14b02a12cc03cd..7d7ddb1d041af834318007693367d22a5e24f708 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -23,12 +23,12 @@ plugins {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.30"))
+ implementation(kotlin("stdlib", "1.3.41"))
implementation("androidx.annotation", "annotation", "1.0.0")
- implementation("org.threeten", "threetenbp", "1.3.8")
- implementation("io.reactivex.rxjava2", "rxjava", "2.1.9")
+ implementation("org.threeten", "threetenbp", "1.4.0")
+ implementation("io.reactivex.rxjava2", "rxjava", "2.2.10")
implementation(project(":invokerannotations"))
kapt(project(":invokergenerator"))
diff --git a/lifecycle-ktx/build.gradle.kts b/lifecycle-ktx/build.gradle.kts
index c72d8f999103abbb7a2c4204ff0777d7442a1567..78cb1924295f37d8057999c19e1f2a3f7c7da253 100644
--- a/lifecycle-ktx/build.gradle.kts
+++ b/lifecycle-ktx/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.30"))
+ implementation(kotlin("stdlib", "1.3.41"))
implementation("androidx.annotation", "annotation", "1.0.0")
diff --git a/malheur/build.gradle.kts b/malheur/build.gradle.kts
index a2809d03cb61bf2f7e5f38becd583abc7faab741..4f7d5eca57453acb32ae24e53fcb4638435d9d30 100644
--- a/malheur/build.gradle.kts
+++ b/malheur/build.gradle.kts
@@ -44,7 +44,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.30"))
+ implementation(kotlin("stdlib", "1.3.41"))
implementation("com.google.code.gson", "gson", "2.8.5")
implementation("androidx.annotation", "annotation", "1.0.1")
diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
index b8c30245228fb736708cc143e42817f4c7237830..b0ad03b43d64c0de3e166937fdd95623977f81c5 100644
--- a/persistence/build.gradle.kts
+++ b/persistence/build.gradle.kts
@@ -51,11 +51,11 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.30"))
+ implementation(kotlin("stdlib", "1.3.41"))
- implementation("androidx.appcompat", "appcompat", "1.0.0")
+ implementation("androidx.appcompat", "appcompat", "1.0.2")
- withVersion("2.0.0") {
+ withVersion("2.1.0") {
implementation("androidx.room", "room-runtime", version)
kapt("androidx.room", "room-compiler", version)
implementation("androidx.room", "room-rxjava2", version)
@@ -65,7 +65,7 @@ dependencies {
implementation("androidx.paging", "paging-runtime", "2.1.0")
// Utility
- implementation("org.threeten", "threetenbp", "1.3.8", classifier = "no-tzdb")
+ implementation("org.threeten", "threetenbp", "1.4.0", classifier = "no-tzdb")
implementation("org.jetbrains", "annotations", "17.0.0")
// Quassel
diff --git a/ui_spinner/build.gradle.kts b/ui_spinner/build.gradle.kts
index f6d1bf57126ab4b36c2acf7b3137d1bc27d173c2..d8373bc54341bf8fde631770aa27ce7c4c9effa3 100644
--- a/ui_spinner/build.gradle.kts
+++ b/ui_spinner/build.gradle.kts
@@ -44,6 +44,6 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.30"))
- implementation("androidx.appcompat", "appcompat", "1.0.0")
+ implementation(kotlin("stdlib", "1.3.41"))
+ implementation("androidx.appcompat", "appcompat", "1.0.2")
}
diff --git a/viewmodel/build.gradle.kts b/viewmodel/build.gradle.kts
index 7430dd78a3160be3e0588d7b25cb77305b96b524..2130a6a62d306575572c47524855aa21f772a2cd 100644
--- a/viewmodel/build.gradle.kts
+++ b/viewmodel/build.gradle.kts
@@ -44,18 +44,18 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.3.30"))
+ implementation(kotlin("stdlib", "1.3.41"))
- implementation("androidx.appcompat", "appcompat", "1.0.0")
+ implementation("androidx.appcompat", "appcompat", "1.0.2")
withVersion("2.0.0") {
implementation("androidx.lifecycle", "lifecycle-extensions", version)
implementation("androidx.lifecycle", "lifecycle-reactivestreams", version)
}
// Utility
- implementation("io.reactivex.rxjava2", "rxandroid", "2.0.2")
- implementation("io.reactivex.rxjava2", "rxjava", "2.1.9")
- implementation("org.threeten", "threetenbp", "1.3.8", classifier = "no-tzdb")
+ implementation("io.reactivex.rxjava2", "rxandroid", "2.1.1")
+ implementation("io.reactivex.rxjava2", "rxjava", "2.2.10")
+ implementation("org.threeten", "threetenbp", "1.4.0", classifier = "no-tzdb")
implementation("org.jetbrains", "annotations", "17.0.0")
implementation("javax.inject", "javax.inject", "1")