Feat: wire one ios

.java-version

@@ -1 +1 @@
-17.0
+21.0

app/build.gradle.kts

@@ -26,7 +26,6 @@ plugins {
     // id(BuildPlugins.kotlinAndroidExtensions)
     id(BuildPlugins.kotlinParcelize)
     id(BuildPlugins.junit5)
-    id(libs.plugins.wire.hilt.get().pluginId)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
     alias(libs.plugins.compose.compiler)
@@ -202,6 +201,7 @@ dependencies {
     implementationWithCoverage(projects.features.sketch)
     implementationWithCoverage(projects.features.meetings)
     implementationWithCoverage(projects.features.sync)
+    implementation(projects.shared.auth)
 
     // Anonymous Analytics
     val flavors = getFlavorsSettings()
@@ -274,14 +274,11 @@ dependencies {
     // Emoji
     implementation(libs.androidx.emoji.picker)
 
-    // hilt
-    implementation(libs.hilt.navigationCompose)
-    implementation(libs.hilt.work)
-
     // smaller view models
     implementation(libs.resaca.core)
-    implementation(libs.resaca.hilt)
+    implementation(libs.resaca.metro)
     implementation(libs.bundlizer.core)
+    implementation(libs.dagger)
 
     allFlavors.forEach { flavor ->
         if (flavor in nonFreeFlavors) {
@@ -331,9 +328,6 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.intents)
     androidTestImplementation(libs.androidx.espresso.accessibility)
     androidTestImplementation(libs.hamcrest)
-    androidTestImplementation(libs.hilt.test)
-    kspAndroidTest(libs.hilt.compiler)
-
     androidTestImplementation(libs.androidx.test.extJunit)
     androidTestImplementation(libs.androidx.test.uiAutomator)
     androidTestImplementation(libs.androidx.test.work)

app/src/androidTest/kotlin/com/wire/android/CustomTestRunner.kt

@@ -23,6 +23,6 @@ import androidx.test.runner.AndroidJUnitRunner
 
 class CustomTestRunner : AndroidJUnitRunner() {
     override fun newApplication(cl: ClassLoader?, className: String?, context: Context?): Application {
-        return super.newApplication(cl, HiltTestApp_Application::class.java.name, context)
+        return super.newApplication(cl, WireApplication::class.java.name, context)
     }
 }

app/src/androidTest/kotlin/com/wire/android/WireActivityTest.kt

@@ -34,21 +34,15 @@ import com.wire.android.util.DataDogLogger
 import com.wire.kalium.logger.KaliumLogLevel
 import com.wire.kalium.logger.KaliumLogger
 import com.wire.kalium.common.logger.CoreLogger
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
-@HiltAndroidTest
 class WireActivityTest {
 
-    @get:Rule(order = 0)
-    var hiltRule = HiltAndroidRule(this)
-
-    @get:Rule(order = 1)
+    @get:Rule
     val composeTestRule: AndroidComposeTestRule<ActivityScenarioRule<WireActivity>, WireActivity> =
         createAndroidComposeRule<WireActivity>()
 
@@ -58,7 +52,6 @@ class WireActivityTest {
         context.deleteDatabase("global-db") // GLOBAL_DB_NAME in FileNameUtil
         WorkManagerTestInitHelper.initializeTestWorkManager(context)
         initializeApplicationLoggingFrameworks()
-        hiltRule.inject()
     }
 
     @Ignore // TODO add other api mocks to not have flaky test

app/src/foss/kotlin/com/wire/android/ui/home/messagecomposer/location/LocationPickerHelperFlavor.kt

@@ -17,9 +17,10 @@
  */
 package com.wire.android.ui.home.messagecomposer.location
 
+import dev.zacsweers.metro.Inject as MetroInject
 import javax.inject.Inject
 
-class LocationPickerHelperFlavor @Inject constructor(
+class LocationPickerHelperFlavor @Inject @MetroInject constructor(
     private val locationPickerHelper: LocationPickerHelper,
 ) {
     suspend fun getLocation(onSuccess: (GeoLocatedAddress) -> Unit, onError: () -> Unit) {