Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-20 00:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to AGP 9.4.0

Browse Source
This commit is contained in:
Greyson Parrelli
2026-09-10 23:50:03 -04:00
parent e90e421fea
commit bdf60c934e
6 changed files with 523 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lint-baseline.xml
+26 -246
View File
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 9.2.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.2.1)" variant="all" version="9.2.1">
<issue
id="SoonBlockedPrivateApi"
message="Reflective access to mAttachInfo will throw an exception when targeting API 35 and above"
errorLine1=" Field attachInfoField = View.class.getDeclaredField(&quot;mAttachInfo&quot;);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java"
line="157"
column="31"/>
</issue>
<issues format="6" by="lint 9.4.0" type="baseline" client="gradle" dependencies="false" name="AGP (9.4.0)" variant="all" version="9.4.0">
<issue
id="ThreadConstraint"
@@ -19,7 +8,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt"
line="710"
line="786"
column="5"/>
</issue>
@@ -30,7 +19,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt"
line="1767"
line="1850"
column="5"/>
</issue>
@@ -41,32 +30,10 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt"
line="5014"
line="5195"
column="7"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@WorkerThread`, incompatible with earlier code that must run from `@{Main,Ui}Thread`"
errorLine1=" setBodyText(messageRecord, searchQuery, isMessageRequestAccepted);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="432"
column="5"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@WorkerThread`, incompatible with earlier code that must run from `@{Main,Ui}Thread`"
errorLine1=" setStoryReactionLabel(messageRecord);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="444"
column="5"/>
</issue>
<issue
id="ThreadConstraint"
message="Call must be from `@WorkerThread`, but super method `View.onMeasure(…)` is allowing `@{Main,Ui}Thread`"
@@ -74,7 +41,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="588"
line="589"
column="9"/>
</issue>
@@ -85,7 +52,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="702"
line="707"
column="47"/>
</issue>
@@ -96,7 +63,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="769"
line="785"
column="7"/>
</issue>
@@ -107,40 +74,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="770"
column="7"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" bodyText.setOverflowText(null);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="1159"
column="7"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" if (hasExtraText(messageRecord)) {"
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="1186"
column="7"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" bodyText.setTextAsync(StringUtil.trim(styledText));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="1206"
line="786"
column="7"/>
</issue>
@@ -151,21 +85,10 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="1364"
line="1427"
column="9"/>
</issue>
<issue
id="ThreadConstraint"
message="Condition must run from `@WorkerThread`, while branches must run from `@{Main,Ui}Thread`"
errorLine1=" } else if (hasNoBubble(messageRecord)) {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="1476"
column="16"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
@@ -173,52 +96,19 @@
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="1503"
line="1568"
column="7"/>
</issue>
<issue
id="ThreadConstraint"
message="Branch must run from `@WorkerThread`, incompatible with the other that must run from `@{Main,Ui}Thread`"
errorLine1=" } else if (isGiftMessage(messageRecord)) {"
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="1543"
column="12"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@WorkerThread`, incompatible with earlier code that must run from `@{Main,Ui}Thread`"
errorLine1=" if (jobId != null) {"
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="2820"
column="9"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@WorkerThread`, incompatible with earlier code that must run from `@{Main,Ui}Thread`"
errorLine1=" launchMediaPreview(v, slide);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java"
line="2900"
column="9"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" {"
errorLine2=" ^">
errorLine1=" setSelectedConversations(selectedConversations);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java"
line="232"
column="3"/>
line="290"
column="5"/>
</issue>
<issue
@@ -228,7 +118,7 @@
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java"
line="194"
line="196"
column="3"/>
</issue>
@@ -250,7 +140,7 @@
errorLine2=" ~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java"
line="122"
line="125"
column="39"/>
</issue>
@@ -261,7 +151,7 @@
errorLine2=" ~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java"
line="123"
line="126"
column="61"/>
</issue>
@@ -272,21 +162,10 @@
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt"
line="213"
line="216"
column="7"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" if (avatarProgress == null &amp;&amp; avatarState.loadingState == EditProfileViewModel.LoadingState.LOADING) {"
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt"
line="226"
column="5"/>
</issue>
<issue
id="ThreadConstraint"
message="Call must be from `@WorkerThread`, but super method `Fragment.onViewCreated(…)` is allowing `@{Main,Ui}Thread`"
@@ -294,7 +173,7 @@
errorLine2=" ~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameFragment.java"
line="54"
line="57"
column="38"/>
</issue>
@@ -305,7 +184,7 @@
errorLine2=" ~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameFragment.java"
line="55"
line="58"
column="39"/>
</issue>
@@ -349,7 +228,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java"
line="218"
line="217"
column="41"/>
</issue>
@@ -360,21 +239,10 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/mediapreview/ImageMediaPreviewPageFragment.java"
line="53"
line="56"
column="22"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" text.setTextAsync(body);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageFragment.java"
line="134"
column="7"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
@@ -404,7 +272,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.kt"
line="126"
line="124"
column="5"/>
</issue>
@@ -415,7 +283,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.kt"
line="254"
line="252"
column="5"/>
</issue>
@@ -426,43 +294,10 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.kt"
line="279"
line="277"
column="5"/>
</issue>
<issue
id="ThreadConstraint"
message="Call must be from `@WorkerThread`, but super method `Fragment.onViewCreated(…)` is allowing `@{Main,Ui}Thread`"
errorLine1=" videoEditorFragment = ensureVideoEditorFragment()"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/mediasend/v2/videos/MediaReviewVideoPageFragment.kt"
line="27"
column="27"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@WorkerThread`, incompatible with earlier code that must run from `@{Main,Ui}Thread`"
errorLine1=" if (initialMedia.isNotEmpty()) {"
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt"
line="105"
column="5"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" isJumboji = candidates != null &amp;&amp; candidates.allEmojis &amp;&amp; candidates.size() &lt;= JumboEmoji.MAX_JUMBOJI_COUNT &amp;&amp; (candidates.hasJumboForAll() || JumboEmoji.canDownloadJumbo(context));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java"
line="918"
column="9"/>
</issue>
<issue
id="ThreadConstraint"
message="Call must be from `@WorkerThread`, but super method `Activity.onCreate(…)` is allowing `@{Main,Ui}Thread`"
@@ -470,18 +305,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java"
line="72"
column="5"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" setQuoteText(resolveBody(body, quoteType), slide, originalMissing, storyReaction, quoteTargetContentType);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/components/QuoteView.java"
line="234"
line="78"
column="5"/>
</issue>
@@ -496,50 +320,6 @@
column="5"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" for (Reaction reaction : reactions) {"
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java"
line="133"
column="5"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" reaction.setImageEmoji(model.reaction.emoji)"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt"
line="273"
column="7"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" presentCaption(caption, largeCaption, largeCaptionOverlay, post)"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt"
line="449"
column="9"/>
</issue>
<issue
id="ThreadConstraint"
message="Statement must run from `@{Main,Ui}Thread`, incompatible with earlier code that must run from `@WorkerThread`"
errorLine1=" if (record.hasExtraText()) {"
errorLine2=" ^">
<location
file="src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt"
line="422"
column="5"/>
</issue>
<issue
id="ThreadConstraint"
message="Call must be from `@WorkerThread`, but super method `Fragment.onViewCreated(…)` is allowing `@{Main,Ui}Thread`"
fast-lint/src/main/kotlin/org/signal/fastlint/FastLint.kt
+5 -1
View File
@@ -16,8 +16,11 @@ import com.intellij.psi.JavaRecursiveElementVisitor
import com.intellij.psi.PsiClass
import org.jetbrains.kotlin.K1Deprecation
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.cli.extensionsStorage
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.psi.KtCallExpression
@@ -298,11 +301,12 @@ class FastLint(rules: List<Rule> = ALL_RULES) : AutoCloseable {
// createForProduction is K1 API (opt-in, slated to become an error in Kotlin 2.3). We
// deliberately use the parse-only K1 PSI environment (as ktlint does); migrating to the
// Analysis API is unnecessary for syntax-only checks.
@OptIn(K1Deprecation::class)
@OptIn(K1Deprecation::class, CompilerConfiguration.Internals::class, ExperimentalCompilerApi::class)
private fun createKotlinEnvironment(disposable: Disposable): KotlinCoreEnvironment {
val config = CompilerConfiguration().apply {
put(CommonConfigurationKeys.MODULE_NAME, "fastlint")
put(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
extensionsStorage = CompilerPluginRegistrar.ExtensionStorage()
}
return KotlinCoreEnvironment.createForProduction(disposable, config, EnvironmentConfigFiles.JVM_CONFIG_FILES)
}
gradle/libs.versions.toml
+3 -3
View File
@@ -10,9 +10,9 @@ minSdk = "23"
ndk = "28.0.13004108"
javaVersion = "21"
kotlinJvmTarget = "21"
gradle = "9.2.1"
gradle = "9.4.0"
kotlin = "2.2.20"
android-gradle-plugin = "9.2.1"
android-gradle-plugin = "9.4.0"
# Other versions
androidx-appcompat = "1.7.1"
@@ -160,7 +160,7 @@ google-ez-vcard = "com.googlecode.ez-vcard:ez-vcard:0.9.11"
google-jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
google-guava-android = "com.google.guava:guava:33.6.0-android"
google-flexbox = "com.google.android.flexbox:flexbox:3.0.0"
com-google-devtools-ksp-gradle-plugin = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.3.2"
com-google-devtools-ksp-gradle-plugin = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.3.6"
# Firebase
firebase-messaging = "com.google.firebase:firebase-messaging:25.0.1"
gradle/lint-libs.versions.toml
+1 -1
View File
@@ -2,7 +2,7 @@
# ./gradlew --write-verification-metadata sha256 qa --rerun-tasks
[versions]
lint = "32.2.1"
lint = "32.4.0"
[libraries]
lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lint" }
gradle/verification-metadata.xml
+487 -299
View File
File diff suppressed because it is too large Load Diff
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists