Merge branch 'release/25.09.0'

anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt

@@ -28,7 +28,6 @@ import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.STAR
 import com.squareup.kotlinpoet.TypeSpec
-import com.squareup.kotlinpoet.ksp.addOriginatingKSFile
 import com.squareup.kotlinpoet.ksp.toTypeName
 import com.squareup.kotlinpoet.ksp.writeTo
 import dagger.Binds
@@ -79,7 +78,6 @@ class ContributesNodeProcessor(
         )
             .addType(
                 TypeSpec.classBuilder(moduleClassName)
-                    .addOriginatingKSFile(ksClass.containingFile!!)
                     .addModifiers(KModifier.ABSTRACT)
                     .addAnnotation(Module::class)
                     .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember("%T::class", scope.toTypeName()).build())
@@ -104,7 +102,10 @@ class ContributesNodeProcessor(
 
         content.writeTo(
             codeGenerator = codeGenerator,
-            dependencies = Dependencies(aggregating = false),
+            dependencies = Dependencies(
+                aggregating = true,
+                ksClass.containingFile!!
+            ),
         )
     }
 
@@ -138,7 +139,6 @@ class ContributesNodeProcessor(
         val content = FileSpec.builder(generatedPackage, assistedFactoryClassName)
             .addType(
                 TypeSpec.interfaceBuilder(assistedFactoryClassName)
-                    .addOriginatingKSFile(ksClass.containingFile!!)
                     .addSuperinterface(ClassName.bestGuess(assistedNodeFactoryFqName.asString()).parameterizedBy(nodeClassName))
                     .addAnnotation(AssistedFactory::class)
                     .addFunction(
@@ -155,7 +155,10 @@ class ContributesNodeProcessor(
 
         content.writeTo(
             codeGenerator = codeGenerator,
-            dependencies = Dependencies(aggregating = false),
+            dependencies = Dependencies(
+                aggregating = true,
+                ksClass.containingFile!!
+            ),
         )
     }
 

fastlane/metadata/android/en-US/changelogs/202509000.txt

@@ -0,0 +1,2 @@
+Main changes in this version: improved timeline loading times, you can now create shortcuts to your recent conversations, several bug fixes related to media processing and downloading.
+Full changelog: https://github.com/element-hq/element-x-android/releases

gradle/libs.versions.toml

@@ -176,7 +176,7 @@ jsoup = "org.jsoup:jsoup:1.21.2"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.1.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.8.25"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.8.26"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
@@ -215,7 +215,7 @@ anvil_compiler_api = { module = "dev.zacsweers.anvil:compiler-api", version.ref
 anvil_compiler_utils = { module = "dev.zacsweers.anvil:compiler-utils", version.ref = "anvil" }
 
 # Element Call
-element_call_embedded = "io.element.android:element-call-embedded:0.14.1"
+element_call_embedded = "io.element.android:element-call-embedded:0.15.0"
 
 # Auto services
 google_autoservice = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
@@ -244,6 +244,6 @@ paparazzi = "app.cash.paparazzi:2.0.0-alpha02"
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 firebaseAppDistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" }
 knit = { id = "org.jetbrains.kotlinx.knit", version = "0.5.0" }
-sonarqube = "org.sonarqube:6.3.0.5676"
+sonarqube = "org.sonarqube:6.2.0.5505"
 licensee = "app.cash.licensee:1.13.0"
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

plugins/src/main/kotlin/Versions.kt

@@ -29,10 +29,10 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion
  */
 
 private const val versionYear = 25
-private const val versionMonth = 8
+private const val versionMonth = 9
 
 // Note: must be in [0,99]
-private const val versionReleaseNumber = 4
+private const val versionReleaseNumber = 0
 
 object Versions {
     const val VERSION_CODE = (2000 + versionYear) * 10_000 + versionMonth * 100 + versionReleaseNumber