Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #6720 from element-hq/renovate/major-metro

Browse source 
Update metro to v1 (major)
This commit is contained in:
Benoit Marty 2026-05-12 15:56:18 +02:00 • committed by GitHub
commit eb564d6b8e
6 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt
View file

@ -11,7 +11,6 @@ package io.element.android.features.preferences.impl.tasks
import android.content.Context import android.content.Context
import coil3.SingletonImageLoader import coil3.SingletonImageLoader
import dev.zacsweers.metro.ContributesBinding import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Provider
import io.element.android.features.invite.api.SeenInvitesStore import io.element.android.features.invite.api.SeenInvitesStore
import io.element.android.features.preferences.impl.DefaultCacheService import io.element.android.features.preferences.impl.DefaultCacheService
import io.element.android.libraries.cachestore.api.CacheStore import io.element.android.libraries.cachestore.api.CacheStore
@ -34,7 +33,7 @@ class DefaultClearCacheUseCase(
private val matrixClient: MatrixClient, private val matrixClient: MatrixClient,
private val coroutineDispatchers: CoroutineDispatchers, private val coroutineDispatchers: CoroutineDispatchers,
private val defaultCacheService: DefaultCacheService, private val defaultCacheService: DefaultCacheService,
private val okHttpClient: Provider<OkHttpClient>, private val okHttpClient: () -> OkHttpClient,
private val pushService: PushService, private val pushService: PushService,
private val seenInvitesStore: SeenInvitesStore, private val seenInvitesStore: SeenInvitesStore,
private val activeRoomsHolder: ActiveRoomsHolder, private val activeRoomsHolder: ActiveRoomsHolder,

3
features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
View file

@ -14,7 +14,6 @@ import androidx.core.net.toFile
import androidx.core.net.toUri import androidx.core.net.toUri
import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesBinding import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Provider
import dev.zacsweers.metro.SingleIn import dev.zacsweers.metro.SingleIn
import io.element.android.appconfig.RageshakeConfig import io.element.android.appconfig.RageshakeConfig
import io.element.android.features.rageshake.api.logs.createWriteToFilesConfiguration import io.element.android.features.rageshake.api.logs.createWriteToFilesConfiguration
@ -77,7 +76,7 @@ class DefaultBugReporter(
private val screenshotHolder: ScreenshotHolder, private val screenshotHolder: ScreenshotHolder,
private val crashDataStore: CrashDataStore, private val crashDataStore: CrashDataStore,
private val coroutineDispatchers: CoroutineDispatchers, private val coroutineDispatchers: CoroutineDispatchers,
private val okHttpClient: Provider<OkHttpClient>, private val okHttpClient: () -> OkHttpClient,
private val userAgentProvider: UserAgentProvider, private val userAgentProvider: UserAgentProvider,
private val sessionStore: SessionStore, private val sessionStore: SessionStore,
private val buildMeta: BuildMeta, private val buildMeta: BuildMeta,

2
gradle/libs.versions.toml
View file

@ -54,7 +54,7 @@ haze = "1.7.2"
dependencyAnalysis = "3.10.0" dependencyAnalysis = "3.10.0"
# DI # DI
metro = "0.13.2" metro = "1.0.0"
# Auto service # Auto service
autoservice = "1.1.1" autoservice = "1.1.1"

3
libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
View file

@ -16,7 +16,6 @@ import coil3.gif.GifDecoder
import coil3.network.okhttp.OkHttpNetworkFetcherFactory import coil3.network.okhttp.OkHttpNetworkFetcherFactory
import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesBinding import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Provider
import io.element.android.libraries.di.annotations.ApplicationContext import io.element.android.libraries.di.annotations.ApplicationContext
import io.element.android.libraries.matrix.api.media.MatrixMediaLoader import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -29,7 +28,7 @@ interface ImageLoaderFactory {
@ContributesBinding(AppScope::class) @ContributesBinding(AppScope::class)
class DefaultImageLoaderFactory( class DefaultImageLoaderFactory(
@ApplicationContext private val context: Context, @ApplicationContext private val context: Context,
private val okHttpClient: Provider<OkHttpClient>, private val okHttpClient: () -> OkHttpClient,
) : ImageLoaderFactory { ) : ImageLoaderFactory {
private val okHttpNetworkFetcherFactory = OkHttpNetworkFetcherFactory( private val okHttpNetworkFetcherFactory = OkHttpNetworkFetcherFactory(
callFactory = { callFactory = {

5
libraries/network/src/main/kotlin/io/element/android/libraries/network/RetrofitFactory.kt
View file

@ -9,7 +9,6 @@
package io.element.android.libraries.network package io.element.android.libraries.network
import dev.zacsweers.metro.Inject import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.Provider
import io.element.android.libraries.androidutils.json.JsonProvider import io.element.android.libraries.androidutils.json.JsonProvider
import io.element.android.libraries.core.uri.ensureTrailingSlash import io.element.android.libraries.core.uri.ensureTrailingSlash
import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaType
@ -19,8 +18,8 @@ import retrofit2.converter.kotlinx.serialization.asConverterFactory
@Inject @Inject
class RetrofitFactory( class RetrofitFactory(
private val okHttpClient: Provider<OkHttpClient>, private val okHttpClient: () -> OkHttpClient,
private val json: Provider<JsonProvider>, private val json: () -> JsonProvider,
) { ) {
fun create(baseUrl: String): Retrofit = Retrofit.Builder() fun create(baseUrl: String): Retrofit = Retrofit.Builder()
.baseUrl(baseUrl.ensureTrailingSlash()) .baseUrl(baseUrl.ensureTrailingSlash())

3
libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DefaultEncoder.kt
View file

@ -9,7 +9,6 @@
package io.element.android.libraries.voicerecorder.impl.audio package io.element.android.libraries.voicerecorder.impl.audio
import dev.zacsweers.metro.ContributesBinding import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Provider
import io.element.android.libraries.di.RoomScope import io.element.android.libraries.di.RoomScope
import io.element.android.opusencoder.OggOpusEncoder import io.element.android.opusencoder.OggOpusEncoder
import timber.log.Timber import timber.log.Timber
@ -20,7 +19,7 @@ import java.io.File
*/ */
@ContributesBinding(RoomScope::class) @ContributesBinding(RoomScope::class)
class DefaultEncoder( class DefaultEncoder(
private val encoderProvider: Provider<OggOpusEncoder>, private val encoderProvider: () -> OggOpusEncoder,
config: AudioConfig, config: AudioConfig,
) : Encoder { ) : Encoder {
private val bitRate = config.bitRate private val bitRate = config.bitRate