diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index 02aecd4664..13d69dc5b4 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -1,16 +1,5 @@ - - - - - + @@ -30,7 +19,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -41,32 +30,10 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - @@ -85,7 +52,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -96,7 +63,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -107,40 +74,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - - - - - @@ -151,21 +85,10 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - - - - - - - - - + errorLine1=" setSelectedConversations(selectedConversations);" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + line="290" + column="5"/> @@ -250,7 +140,7 @@ errorLine2=" ~~~~~~"> @@ -261,7 +151,7 @@ errorLine2=" ~~~~~~"> @@ -272,21 +162,10 @@ errorLine2=" ^"> - - - - @@ -305,7 +184,7 @@ errorLine2=" ~~~~~~"> @@ -349,7 +228,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -360,21 +239,10 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - @@ -415,7 +283,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -426,43 +294,10 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - - - - - - - - - @@ -496,50 +320,6 @@ column="5"/> - - - - - - - - - - - - - - - - = 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) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c69c18a8b1..edb1739af5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/gradle/lint-libs.versions.toml b/gradle/lint-libs.versions.toml index 0b0cbdaacd..08cf164bfc 100644 --- a/gradle/lint-libs.versions.toml +++ b/gradle/lint-libs.versions.toml @@ -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" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index ed0395a5fa..8b3bfa87cf 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1691,22 +1691,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - + + - - - + + + - - - + + + - - + + @@ -3823,14 +3823,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + @@ -3851,19 +3851,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - + + - - - + + + - - - + + + @@ -3876,110 +3876,130 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - + + + - - - + + + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3987,44 +4007,44 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -4053,29 +4073,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - - + + + - - - - - - - - + + + @@ -4083,9 +4098,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4101,39 +4116,39 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -4146,132 +4161,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -4689,9 +4592,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4702,28 +4605,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -4883,6 +4786,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6406,6 +6317,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6414,6 +6333,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6422,11 +6349,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -6435,6 +6375,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6443,6 +6391,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6451,6 +6407,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6459,6 +6423,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6467,6 +6439,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6475,6 +6455,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6483,6 +6471,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6491,6 +6487,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6536,6 +6540,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6643,6 +6652,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6683,6 +6700,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6708,6 +6733,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6745,6 +6775,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6753,6 +6791,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6773,6 +6819,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6788,6 +6839,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6828,6 +6884,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6848,6 +6909,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6892,6 +6958,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6907,6 +6981,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -6942,6 +7021,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6966,6 +7053,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -6981,6 +7076,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7017,6 +7117,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7032,6 +7137,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7067,6 +7177,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7117,6 +7232,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7125,6 +7245,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -7315,6 +7443,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + @@ -7435,6 +7574,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7450,6 +7594,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7465,6 +7614,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7480,6 +7634,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7885,6 +8044,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -7945,6 +8109,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -7961,6 +8133,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -7977,6 +8157,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index daee2e0ed7..2e8422a4e8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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