From b2a6368315a715ebc57a60dc5c54d94a80c0be23 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 27 Nov 2018 17:49:44 +0100
Subject: [PATCH] Updated Libraries
---
app/build.gradle.kts | 16 ++++++++--------
app/proguard-rules.pro | 7 +++----
app/sampledata/libraries.json | 2 +-
.../ui/clientsettings/about/AboutFragment.kt | 2 +-
build.gradle.kts | 2 +-
invokergenerator/build.gradle.kts | 2 +-
.../libquassel/annotations/InvokerProcessor.java | 2 +-
lib/build.gradle.kts | 8 +++-----
.../libquassel/quassel/syncables/IrcChannel.kt | 2 +-
lifecycle-ktx/build.gradle.kts | 2 +-
malheur/build.gradle.kts | 4 ++--
persistence/build.gradle.kts | 6 +++---
viewmodel/build.gradle.kts | 6 +++---
13 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 916f0973c..bc783b9ca 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -109,7 +109,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.2.60"))
+ implementation(kotlin("stdlib", "1.3.10"))
// App Compat
implementation("com.google.android.material", "material", "1.0.0-rc01")
@@ -137,12 +137,12 @@ dependencies {
// Utility
implementation("io.reactivex.rxjava2", "rxandroid", "2.0.2")
implementation("io.reactivex.rxjava2", "rxjava", "2.1.9")
- implementation("org.threeten", "threetenbp", "1.3.6", classifier = "no-tzdb")
- implementation("org.jetbrains", "annotations", "16.0.1")
- implementation("com.google.code.gson", "gson", "2.8.2")
+ implementation("org.threeten", "threetenbp", "1.3.8", classifier = "no-tzdb")
+ implementation("org.jetbrains", "annotations", "16.0.3")
+ implementation("com.google.code.gson", "gson", "2.8.5")
implementation("commons-codec", "commons-codec", "1.11")
- implementation("com.squareup.retrofit2", "retrofit", "2.4.0")
- implementation("com.squareup.retrofit2", "converter-gson", "2.4.0")
+ implementation("com.squareup.retrofit2", "retrofit", "2.5.0")
+ implementation("com.squareup.retrofit2", "converter-gson", "2.5.0")
withVersion("9.0.0-rc1") {
implementation("com.jakewharton", "butterknife", version)
kapt("com.jakewharton", "butterknife-compiler", version)
@@ -156,7 +156,7 @@ dependencies {
}
// UI
- implementation("me.zhanghai.android.materialprogressbar", "library", "1.4.2")
+ implementation("me.zhanghai.android.materialprogressbar", "library", "1.6.0")
withVersion("0.9.6.0") {
implementation("com.afollestad.material-dialogs", "core", version)
implementation("com.afollestad.material-dialogs", "commons", version)
@@ -169,7 +169,7 @@ dependencies {
// Quality Assurance
implementation(project(":malheur"))
- withVersion("1.5.4") {
+ withVersion("1.6.2") {
debugImplementation("com.squareup.leakcanary", "leakcanary-android", version)
releaseImplementation("com.squareup.leakcanary", "leakcanary-android-no-op", version)
testImplementation("com.squareup.leakcanary", "leakcanary-android-no-op", version)
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 5d4a7e48c..bcbaf4e51 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -43,10 +43,7 @@
# Dagger
-dontwarn com.google.errorprone.annotations.*
# Retrofit
-# Platform calls Class.forName on types which do not exist on Android to determine platform.
--dontnote retrofit2.Platform
-# Platform used when running on Java 8 VMs. Will not be used at runtime.
--dontwarn retrofit2.Platform$Java8
+-dontwarn retrofit2.**
# Annotation used by Retrofit on Java 8 VMs
-dontwarn javax.annotation.Nullable
-dontwarn javax.annotation.ParametersAreNonnullByDefault
@@ -58,3 +55,5 @@
# Okio
-dontwarn okio.**
-dontwarn org.conscrypt.**
+# OkHttp3
+-dontwarn okhttp3.**
diff --git a/app/sampledata/libraries.json b/app/sampledata/libraries.json
index d2886bada..1c15fc706 100644
--- a/app/sampledata/libraries.json
+++ b/app/sampledata/libraries.json
@@ -161,7 +161,7 @@
},
{
"name": "Kotlin Standard Library",
- "version": "1.2.60",
+ "version": "1.3.10",
"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 6805cd88e..e557ca9b2 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.60",
+ version = "1.3.10",
license = apache2,
url = "https://kotlinlang.org/"
),
diff --git a/build.gradle.kts b/build.gradle.kts
index ea718ef43..081ebb6f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,7 +24,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:3.2.1")
- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.10")
}
}
diff --git a/invokergenerator/build.gradle.kts b/invokergenerator/build.gradle.kts
index e323790a3..793361eca 100644
--- a/invokergenerator/build.gradle.kts
+++ b/invokergenerator/build.gradle.kts
@@ -28,5 +28,5 @@ plugins {
dependencies {
implementation(project(":invokerannotations"))
implementation("com.google.auto.service:auto-service:1.0-rc4")
- implementation("com.squareup:javapoet:1.10.0")
+ implementation("com.squareup:javapoet:1.11.1")
}
diff --git a/invokergenerator/src/main/java/de/kuschku/libquassel/annotations/InvokerProcessor.java b/invokergenerator/src/main/java/de/kuschku/libquassel/annotations/InvokerProcessor.java
index b0497183d..0cb9343ff 100644
--- a/invokergenerator/src/main/java/de/kuschku/libquassel/annotations/InvokerProcessor.java
+++ b/invokergenerator/src/main/java/de/kuschku/libquassel/annotations/InvokerProcessor.java
@@ -109,7 +109,7 @@ public class InvokerProcessor extends AbstractProcessor {
ClassName type = ClassName.get(packageName, invokerName);
ClassName wrongObjectTypeException = ClassName.get("de.kuschku.libquassel.quassel.exceptions", "WrongObjectTypeException");
ClassName unknownMethodException = ClassName.get("de.kuschku.libquassel.quassel.exceptions", "UnknownMethodException");
- ClassName nonNullAnnotation = ClassName.get("android.support.annotation", "NonNull");
+ ClassName nonNullAnnotation = ClassName.get("androidx.annotation", "NonNull");
MethodSpec methodSpecConstructor = MethodSpec
.constructorBuilder()
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 90f914790..b47a83d6b 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -29,13 +29,11 @@ plugins {
}
dependencies {
- implementation(kotlin("stdlib", "1.2.60"))
+ implementation(kotlin("stdlib", "1.3.10"))
- withVersion("27.1.1") {
- implementation("com.android.support", "support-annotations", version)
- }
+ implementation("androidx.annotation", "annotation", "1.0.0")
- implementation("org.threeten", "threetenbp", "1.3.6")
+ implementation("org.threeten", "threetenbp", "1.3.8")
implementation("io.reactivex.rxjava2", "rxjava", "2.1.9")
implementation(project(":invokerannotations"))
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
index 543925d72..7c2ad2d59 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
@@ -401,7 +401,7 @@ class IrcChannel(
private val live_userModes = BehaviorSubject.createDefault(mutableMapOf<IrcUser, String>())
private var _userModes: MutableMap<IrcUser, String>
- get() = live_userModes.value
+ get() = live_userModes.value!!
set(value) {
updateUsers()
}
diff --git a/lifecycle-ktx/build.gradle.kts b/lifecycle-ktx/build.gradle.kts
index 183854ebb..b091ba0e2 100644
--- a/lifecycle-ktx/build.gradle.kts
+++ b/lifecycle-ktx/build.gradle.kts
@@ -27,7 +27,7 @@ plugins {
}
dependencies {
- implementation(kotlin("stdlib", "1.2.60"))
+ implementation(kotlin("stdlib", "1.3.10"))
implementation("androidx.annotation", "annotation", "1.0.0")
diff --git a/malheur/build.gradle.kts b/malheur/build.gradle.kts
index 9db295fab..6fb6fee4e 100644
--- a/malheur/build.gradle.kts
+++ b/malheur/build.gradle.kts
@@ -44,7 +44,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.2.60"))
+ implementation(kotlin("stdlib", "1.3.10"))
- implementation("com.google.code.gson", "gson", "2.8.2")
+ implementation("com.google.code.gson", "gson", "2.8.5")
}
diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
index d71940c29..9aad92990 100644
--- a/persistence/build.gradle.kts
+++ b/persistence/build.gradle.kts
@@ -51,7 +51,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.2.60"))
+ implementation(kotlin("stdlib", "1.3.10"))
implementation("androidx.appcompat", "appcompat", "1.0.0")
@@ -63,8 +63,8 @@ dependencies {
implementation("androidx.paging", "paging-runtime", "2.0.0-rc01")
// Utility
- implementation("org.threeten", "threetenbp", "1.3.6", classifier = "no-tzdb")
- implementation("org.jetbrains", "annotations", "16.0.1")
+ implementation("org.threeten", "threetenbp", "1.3.8", classifier = "no-tzdb")
+ implementation("org.jetbrains", "annotations", "16.0.3")
// Quassel
implementation(project(":lib")) {
diff --git a/viewmodel/build.gradle.kts b/viewmodel/build.gradle.kts
index 7edf82a86..683547f02 100644
--- a/viewmodel/build.gradle.kts
+++ b/viewmodel/build.gradle.kts
@@ -44,7 +44,7 @@ android {
}
dependencies {
- implementation(kotlin("stdlib", "1.2.60"))
+ implementation(kotlin("stdlib", "1.3.10"))
implementation("androidx.appcompat", "appcompat", "1.0.0")
@@ -54,8 +54,8 @@ dependencies {
// Utility
implementation("io.reactivex.rxjava2", "rxandroid", "2.0.2")
implementation("io.reactivex.rxjava2", "rxjava", "2.1.9")
- implementation("org.threeten", "threetenbp", "1.3.6", classifier = "no-tzdb")
- implementation("org.jetbrains", "annotations", "16.0.1")
+ implementation("org.threeten", "threetenbp", "1.3.8", classifier = "no-tzdb")
+ implementation("org.jetbrains", "annotations", "16.0.3")
// Quassel
implementation(project(":persistence"))
--
GitLab