From 8a2e15b76b4058089f8fc3838e6868366cbecac0 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Sat, 29 Mar 2025 15:56:43 -0400 Subject: [PATCH] Update to gradle 8.9.0 --- app/src/main/AndroidManifest.xml | 60 +- .../securesms/fonts/SignalSymbols.kt | 2 +- .../securesms/jobs/LocalBackupJobApi29.java | 1 + constants.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- gradle/verification-metadata.xml | 834 ++++++++++++------ gradle/wrapper/gradle-wrapper.properties | 4 +- reproducible-builds/Dockerfile | 2 +- 8 files changed, 612 insertions(+), 295 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 23e1d85a84..26f23341c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -602,30 +602,44 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt index 35af14e79c..09160103c3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt @@ -112,7 +112,7 @@ object SignalSymbols { private fun update(tp: TextPaint?) { tp.apply { val old = this!!.typeface - val oldStyle = old?.style ?: 0 + val oldStyle = old?.style ?: Typeface.NORMAL val font = Typeface.create(font, oldStyle) typeface = font } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJobApi29.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJobApi29.java index 2d1a41ed89..85b78629b8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJobApi29.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJobApi29.java @@ -65,6 +65,7 @@ public final class LocalBackupJobApi29 extends BaseJob { return KEY; } + @SuppressLint("NewApi") @Override public void onRun() throws IOException { Log.i(TAG, "Executing backup job..."); diff --git a/constants.gradle.kts b/constants.gradle.kts index e6862fbaeb..c681e32c28 100644 --- a/constants.gradle.kts +++ b/constants.gradle.kts @@ -1,4 +1,4 @@ -val signalBuildToolsVersion by extra("34.0.0") +val signalBuildToolsVersion by extra("35.0.0") val signalCompileSdkVersion by extra("android-35") val signalTargetSdkVersion by extra(34) val signalMinSdkVersion by extra(21) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 50604e13dc..63e3f39e74 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ androidx-media3 = "1.5.1" androidx-navigation = "2.8.5" androidx-window = "1.3.0" glide = "4.15.1" -gradle = "8.7.3" +gradle = "8.9.0" kotlin = "2.1.0" libsignal-client = "0.68.0" mp4parser = "1.9.39" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f413afa6ae..3a0b4b0df7 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1243,8 +1243,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - + + @@ -1253,17 +1253,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -2867,8 +2867,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - + + @@ -2877,8 +2877,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - + + @@ -2902,6 +2902,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2917,6 +2922,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2932,6 +2942,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2952,9 +2967,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -2967,6 +2982,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2977,9 +2997,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -2992,9 +3012,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -3007,9 +3027,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -3017,8 +3037,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - + + @@ -3032,9 +3052,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -3047,9 +3067,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -3062,9 +3082,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -3078,6 +3098,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3094,12 +3119,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -3110,12 +3135,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -3123,8 +3148,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - + + @@ -3133,8 +3158,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - + + @@ -3146,12 +3171,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -3170,12 +3195,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -3186,12 +3211,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -3199,6 +3224,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3207,12 +3237,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -3223,12 +3253,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -3239,12 +3269,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -3263,12 +3293,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -3302,14 +3332,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + @@ -3322,6 +3352,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3332,6 +3367,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3342,6 +3382,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3352,9 +3397,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -3367,6 +3412,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3377,6 +3427,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3387,11 +3442,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -3402,9 +3467,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -3417,17 +3482,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -3435,17 +3500,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -3453,17 +3518,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -3471,17 +3536,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -3489,17 +3554,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -3507,17 +3572,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -3525,30 +3590,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + @@ -3556,17 +3621,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -3574,17 +3639,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -3592,17 +3657,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - + + @@ -3610,14 +3675,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + @@ -3863,11 +3928,26 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + @@ -3923,6 +4003,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3980,6 +4065,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4126,34 +4216,49 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + @@ -4161,9 +4266,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + + + + + + @@ -4849,6 +4959,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4968,6 +5083,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4978,6 +5098,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4988,11 +5113,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -5003,6 +5138,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5013,6 +5153,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -5023,6 +5173,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5270,6 +5425,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -5429,6 +5594,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5444,6 +5614,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5454,6 +5629,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5488,6 +5668,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5523,12 +5708,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -5589,12 +5774,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -5607,6 +5792,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5617,6 +5807,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5642,6 +5837,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5652,6 +5852,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5667,6 +5872,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5687,6 +5897,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5705,6 +5920,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -5713,9 +5936,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -5723,15 +5946,15 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - + + @@ -5745,12 +5968,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -5761,9 +5984,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -5771,12 +5994,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -5787,9 +6010,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -5802,9 +6025,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -5817,9 +6040,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -5857,9 +6080,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -5877,17 +6100,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + - - - + + + - - + + @@ -5975,6 +6203,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6032,6 +6265,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + @@ -6067,11 +6306,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -6102,6 +6351,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6197,9 +6451,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -6207,9 +6461,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -6217,9 +6471,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -6253,6 +6507,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6261,6 +6520,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6503,6 +6770,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6644,6 +6916,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6654,6 +6931,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6664,6 +6946,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6674,6 +6961,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6684,6 +6976,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6858,6 +7155,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 bc7aec6fc1..d28ddc8899 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=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionSha256Sum=89d4e70e4e84e2d2dfbb63e4daa53e21b25017cc70c37e4eea31ee51fb15098a +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile index 05c9e77a82..6efa7285e3 100644 --- a/reproducible-builds/Dockerfile +++ b/reproducible-builds/Dockerfile @@ -16,7 +16,7 @@ RUN apt install -y git openjdk-17-jdk unzip wget ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-10406996_latest.zip ENV ANDROID_API_LEVELS android-35 -ENV ANDROID_BUILD_TOOLS_VERSION 34.0.0 +ENV ANDROID_BUILD_TOOLS_VERSION 35.0.0 ENV ANDROID_HOME /usr/local/android-sdk-linux ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin