From 537fc0ef5c19467c91747e20101adedfdb483ee0 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 17 May 2024 10:48:55 -0400 Subject: [PATCH] Update to Kotlin 1.9.20, AGP 8.4.0, and Gradle 8.6 --- app/build.gradle.kts | 2 +- .../securesms/megaphone/Megaphones.java | 1 + .../views/SlideUpWithSnackbarBehavior.java | 2 + build-logic/build.gradle.kts | 2 +- .../main/java/signal-sample-app.gradle.kts | 2 +- build.gradle.kts | 8 +- core-ui/build.gradle.kts | 2 +- dependencies.gradle.kts | 8 +- gradle/verification-metadata.xml | 1227 ++++++++++++++++- gradle/wrapper/gradle-wrapper.properties | 4 +- microbenchmark/build.gradle.kts | 2 + video/app/build.gradle.kts | 2 +- wire-handler/lib/build.gradle.kts | 2 +- 13 files changed, 1246 insertions(+), 18 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d6bb1e9f2a..555cdbb9b5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -152,7 +152,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.4.4" + kotlinCompilerExtensionVersion = "1.5.4" } defaultConfig { diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java index 8108a607ff..e23ba413a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java @@ -398,6 +398,7 @@ public final class Megaphones { .build(); } + @SuppressLint("NewApi") public static @NonNull Megaphone buildGrantFullScreenIntentPermission(@NonNull Context context) { return new Megaphone.Builder(Event.GRANT_FULL_SCREEN_INTENT, Megaphone.Style.BASIC) .setTitle(R.string.GrantFullScreenIntentPermission_megaphone_title) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.java b/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.java index 8833e0d95c..11cc191ebb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.java @@ -1,5 +1,6 @@ package org.thoughtcrime.securesms.util.views; +import android.annotation.SuppressLint; import android.content.Context; import android.util.AttributeSet; import android.view.View; @@ -45,6 +46,7 @@ public class SlideUpWithSnackbarBehavior extends CoordinatorLayout.Behavior - + true false @@ -397,6 +397,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -405,6 +413,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -413,6 +429,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -421,6 +445,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -445,6 +477,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -458,6 +498,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -466,6 +514,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -474,6 +530,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -482,11 +546,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -495,6 +572,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -503,6 +588,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -511,6 +604,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -519,6 +620,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -527,6 +636,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -556,6 +673,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -564,6 +689,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -580,6 +713,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -596,6 +737,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -617,6 +766,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -625,6 +782,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -641,6 +806,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -649,6 +822,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -665,6 +846,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -673,6 +862,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -689,6 +886,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -697,6 +902,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -705,6 +918,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -726,6 +947,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -734,6 +963,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -742,6 +979,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -750,6 +995,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -758,6 +1011,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -766,6 +1027,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -774,6 +1043,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -782,6 +1059,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -798,6 +1083,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -806,6 +1099,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -816,6 +1117,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -824,6 +1130,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -961,6 +1275,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -971,6 +1290,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -979,6 +1303,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2124,16 +2456,31 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + @@ -2149,6 +2496,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2164,16 +2516,31 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + @@ -2189,6 +2556,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2199,6 +2571,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2214,6 +2591,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2229,6 +2611,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2244,11 +2631,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -2259,6 +2656,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2269,6 +2671,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2279,6 +2686,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2301,6 +2713,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + @@ -2317,6 +2740,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2325,16 +2756,34 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + @@ -2343,6 +2792,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2359,6 +2816,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2367,6 +2832,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2377,6 +2850,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2385,6 +2863,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2393,6 +2879,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2401,6 +2895,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2417,6 +2919,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2448,11 +2958,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -2468,6 +2988,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2483,6 +3008,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2498,6 +3028,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2508,6 +3043,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2518,6 +3058,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2528,6 +3073,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2538,11 +3088,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -2553,6 +3113,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2563,6 +3128,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2579,11 +3149,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -2600,11 +3183,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -2621,11 +3217,37 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2642,11 +3264,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -2663,6 +3298,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2673,6 +3316,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + @@ -2689,11 +3350,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -2710,11 +3384,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -2731,11 +3418,29 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + @@ -2966,6 +3671,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3006,6 +3716,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3041,6 +3756,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3057,11 +3777,32 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + @@ -3070,6 +3811,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -3240,6 +3989,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3260,6 +4014,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3285,6 +4044,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3295,6 +4059,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3324,31 +4093,61 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4288,6 +5087,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4451,6 +5255,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4466,6 +5275,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4481,6 +5295,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4491,6 +5310,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4506,6 +5330,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4521,6 +5350,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4536,6 +5370,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4642,6 +5481,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4652,6 +5496,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4662,6 +5511,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4672,6 +5526,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4682,6 +5541,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4692,6 +5556,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4702,6 +5571,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4712,6 +5586,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4722,6 +5601,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4737,6 +5621,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -4753,6 +5647,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -4866,6 +5768,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4876,6 +5783,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4901,6 +5813,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4931,6 +5848,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4956,11 +5878,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -4979,6 +5911,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -4989,6 +5929,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5009,6 +5954,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5052,6 +6002,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -5107,21 +6065,59 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5152,6 +6148,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5162,11 +6163,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -5192,6 +6203,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5205,6 +6221,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -5216,6 +6245,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + @@ -5224,11 +6264,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -5237,36 +6290,79 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5297,6 +6393,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5305,6 +6406,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -5330,6 +6444,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5340,21 +6459,41 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + @@ -5410,6 +6549,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + @@ -5484,6 +6634,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5539,11 +6694,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -5589,26 +6754,51 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5869,6 +7059,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -6012,6 +7212,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6027,6 +7232,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6037,6 +7247,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6052,6 +7267,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6062,6 +7282,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1a703c8b43..e68fc68e50 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip +distributionSha256Sum=85719317abd2112f021d4f41f09ec370534ba288432065f4b477b6a3b652910d +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/microbenchmark/build.gradle.kts b/microbenchmark/build.gradle.kts index 763a353619..1b39ba1ec6 100644 --- a/microbenchmark/build.gradle.kts +++ b/microbenchmark/build.gradle.kts @@ -19,6 +19,7 @@ android { compileSdkVersion = signalCompileSdkVersion compileOptions { + isCoreLibraryDesugaringEnabled = true sourceCompatibility = signalJavaVersion targetCompatibility = signalJavaVersion } @@ -49,6 +50,7 @@ android { } dependencies { + coreLibraryDesugaring(libs.android.tools.desugar) lintChecks(project(":lintchecks")) implementation(project(":core-util")) diff --git a/video/app/build.gradle.kts b/video/app/build.gradle.kts index 51e84b782c..1448c4aed3 100644 --- a/video/app/build.gradle.kts +++ b/video/app/build.gradle.kts @@ -48,7 +48,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.4.3" + kotlinCompilerExtensionVersion = "1.5.4" } packaging { resources { diff --git a/wire-handler/lib/build.gradle.kts b/wire-handler/lib/build.gradle.kts index f98401b2fa..1e93b467e1 100644 --- a/wire-handler/lib/build.gradle.kts +++ b/wire-handler/lib/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName plugins { - id("org.jetbrains.kotlin.jvm") version "1.8.10" + id("org.jetbrains.kotlin.jvm") version "1.9.20" `java-library` }