From 8260be4bff0dc3e56da8e794451d75d5917f7f94 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 18 Apr 2023 16:25:50 -0300 Subject: [PATCH] Upgrade Kotlin to 1.8.10 and Core-KTX to 1.10.0 --- app/build.gradle | 1 - .../notifications/v2/NotificationBuilder.kt | 2 +- dependencies.gradle | 4 +- gradle/verification-metadata.xml | 189 ++++++++++++++++-- 4 files changed, 172 insertions(+), 24 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cfb7e6fdd4..08d96ea12c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -447,7 +447,6 @@ android { } dependencies { - implementation libs.androidx.core.ktx implementation libs.androidx.fragment.ktx lintChecks project(':lintchecks') diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt index 552342e3d2..61ecf33c55 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt @@ -265,7 +265,7 @@ sealed class NotificationBuilder(protected val context: Context) { NotificationCompat.BigPictureStyle() .bigPicture(bigPictureUri.toBitmap(context, BIG_PICTURE_DIMEN)) .setSummaryText(conversation.getContentText(context)) - .bigLargeIcon(null) + .bigLargeIcon(null as Bitmap?) ) return } diff --git a/dependencies.gradle b/dependencies.gradle index cfb2cdbda1..00d57c9779 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -12,7 +12,7 @@ dependencyResolutionManagement { version('androidx-window', '1.0.0') version('exoplayer', '2.18.1') version('glide', '4.13.2') - version('kotlin', '1.7.20') + version('kotlin', '1.8.10') version('libsignal-client', '0.22.0') version('mp4parser', '1.9.39') version('android-gradle-plugin', '7.4.1') @@ -40,7 +40,7 @@ dependencyResolutionManagement { // Android X alias('androidx-activity-ktx').to('androidx.activity', 'activity-ktx').versionRef('androidx-appcompat') alias('androidx-appcompat').to('androidx.appcompat', 'appcompat').versionRef('androidx-appcompat') - alias('androidx-core-ktx').to('androidx.core:core-ktx:1.9.0') + alias('androidx-core-ktx').to('androidx.core:core-ktx:1.10.0') alias('androidx-fragment-ktx').to('androidx.fragment', 'fragment-ktx').versionRef('androidx-fragment') alias('androidx-fragment-testing').to('androidx.fragment', 'fragment-testing').versionRef('androidx-fragment') alias('androidx-annotation').to('androidx.annotation:annotation:1.4.0') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index d0dda1f8d8..313c5d53da 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -102,6 +102,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -123,6 +131,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -540,16 +556,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + - - - - - @@ -566,17 +585,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + - - - - - - + + + @@ -4262,6 +4286,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4277,6 +4306,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4287,6 +4321,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4307,6 +4346,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4317,6 +4361,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4327,6 +4376,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4347,6 +4401,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4360,6 +4419,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -4376,6 +4443,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + @@ -4384,11 +4462,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -4402,6 +4493,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -4412,6 +4511,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4432,6 +4536,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4452,6 +4561,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4477,9 +4591,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4525,6 +4639,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4535,6 +4654,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4545,6 +4669,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4555,6 +4684,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4675,9 +4809,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4710,9 +4844,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4720,6 +4854,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4735,6 +4874,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4745,6 +4889,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + +