From db7f70736fb215e4192744f97004781d8c407b2a Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 13 Oct 2023 21:29:50 +0200 Subject: [PATCH] gradle: bump many deps Signed-off-by: Jason A. Donenfeld --- gradle/libs.versions.toml | 16 ++++++++-------- .../android/activity/LogViewerActivity.kt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 48997e31..d8527046 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,20 +3,20 @@ agp = "8.2.0-beta06" kotlin = "1.9.0" [libraries] -androidx-activity-ktx = "androidx.activity:activity-ktx:1.7.2" -androidx-annotation = "androidx.annotation:annotation:1.6.0" +androidx-activity-ktx = "androidx.activity:activity-ktx:1.8.0" +androidx-annotation = "androidx.annotation:annotation:1.7.0" androidx-appcompat = "androidx.appcompat:appcompat:1.6.1" androidx-biometric = "androidx.biometric:biometric:1.1.0" -androidx-collection = "androidx.collection:collection:1.2.0" +androidx-collection = "androidx.collection:collection:1.3.0" androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0" -androidx-core-ktx = "androidx.core:core-ktx:1.10.1" +androidx-core-ktx = "androidx.core:core-ktx:1.12.0" androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.0.0" -androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.5.7" -androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1" -androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.0" +androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.6.1" +androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2" +androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.1" desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.0.3" -google-material = "com.google.android.material:material:1.9.0" +google-material = "com.google.android.material:material:1.10.0" jsr305 = "com.google.code.findbugs:jsr305:3.0.2" junit = "junit:junit:4.13.2" kotlinx-coroutines-android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.0" diff --git a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt index 155dff36..69e33bc9 100644 --- a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt @@ -223,7 +223,7 @@ class LogViewerActivity : AppCompatActivity() { } else { if (bufferedLogLines.isNotEmpty()) { bufferedLogLines.last().msg += "\n$line" - } else if (!logLines.isEmpty) { + } else if (!logLines.isEmpty()) { logLines[logLines.size() - 1].msg += "\n$line" priorModified = true }