diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index a3035f0a12da..f22180c267b6 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -181,8 +181,7 @@ android { val enableInAppVersionNotifications = gradleLocalProperties(rootProject.projectDir) - .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") - ?: "true" + .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") ?: "true" buildConfigField( "boolean", @@ -320,19 +319,13 @@ dependencies { // Play implementation playImplementation(project(Dependencies.Mullvad.billingLib)) - implementation(Dependencies.androidMaterial) implementation(Dependencies.commonsValidator) - implementation(Dependencies.AndroidX.appcompat) implementation(Dependencies.AndroidX.constraintlayout) - implementation(Dependencies.AndroidX.coordinatorlayout) implementation(Dependencies.AndroidX.coreKtx) - implementation(Dependencies.AndroidX.fragmentKtx) implementation(Dependencies.AndroidX.lifecycleRuntimeKtx) implementation(Dependencies.AndroidX.lifecycleViewmodelKtx) - implementation(Dependencies.AndroidX.recyclerview) implementation(Dependencies.Compose.constrainLayout) implementation(Dependencies.Compose.foundation) - implementation(Dependencies.Compose.viewModelLifecycle) implementation(Dependencies.Compose.material3) implementation(Dependencies.Compose.uiController) implementation(Dependencies.Compose.ui) @@ -340,7 +333,6 @@ dependencies { implementation(Dependencies.jodaTime) implementation(Dependencies.Koin.core) implementation(Dependencies.Koin.android) - implementation(Dependencies.Koin.compose) implementation(Dependencies.Kotlin.reflect) implementation(Dependencies.Kotlin.stdlib) implementation(Dependencies.KotlinX.coroutinesAndroid) @@ -354,7 +346,6 @@ dependencies { // Test dependencies testImplementation(project(Dependencies.Mullvad.commonTestLib)) - testImplementation(Dependencies.Koin.test) testImplementation(Dependencies.Kotlin.test) testImplementation(Dependencies.KotlinX.coroutinesTest) testImplementation(Dependencies.MockK.core) @@ -362,12 +353,9 @@ dependencies { testImplementation(Dependencies.turbine) // UI test dependencies - debugImplementation(Dependencies.AndroidX.fragmentTestning) // Fixes: https://github.com/android/android-test/issues/1589 debugImplementation(Dependencies.AndroidX.testMonitor) debugImplementation(Dependencies.Compose.testManifest) - androidTestImplementation(Dependencies.AndroidX.espressoContrib) - androidTestImplementation(Dependencies.AndroidX.espressoCore) androidTestImplementation(Dependencies.Compose.junit) androidTestImplementation(Dependencies.Koin.test) androidTestImplementation(Dependencies.Kotlin.test) diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index 57af45997b17..b4ee777c00f3 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,5 +1,4 @@ object Dependencies { - const val androidMaterial = "com.google.android.material:material:${Versions.Android.material}" const val androidVolley = "com.android.volley:volley:${Versions.Android.volley}" const val commonsValidator = "commons-validator:commons-validator:${Versions.commonsValidator}" const val jodaTime = "joda-time:joda-time:${Versions.jodaTime}" @@ -14,22 +13,11 @@ object Dependencies { const val appcompat = "androidx.appcompat:appcompat:${Versions.AndroidX.appcompat}" const val constraintlayout = "androidx.constraintlayout:constraintlayout:${Versions.AndroidX.constraintlayout}" - const val coordinatorlayout = - "androidx.coordinatorlayout:coordinatorlayout:${Versions.AndroidX.coordinatorlayout}" const val coreKtx = "androidx.core:core-ktx:${Versions.AndroidX.coreKtx}" - const val fragmentKtx = "androidx.fragment:fragment-ktx:${Versions.AndroidX.fragment}" - const val fragmentTestning = - "androidx.fragment:fragment-testing:${Versions.AndroidX.fragment}" const val lifecycleRuntimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.AndroidX.lifecycle}" const val lifecycleViewmodelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.AndroidX.lifecycle}" - const val recyclerview = - "androidx.recyclerview:recyclerview:${Versions.AndroidX.recyclerview}" - const val espressoCore = - "androidx.test.espresso:espresso-core:${Versions.AndroidX.espresso}" - const val espressoContrib = - "androidx.test.espresso:espresso-contrib:${Versions.AndroidX.espresso}" const val testCore = "androidx.test:core:${Versions.AndroidX.test}" const val testMonitor = @@ -50,8 +38,6 @@ object Dependencies { const val foundation = "androidx.compose.foundation:foundation:${Versions.Compose.foundation}" const val junit = "androidx.compose.ui:ui-test-junit4:${Versions.Compose.base}" - const val viewModelLifecycle = - "androidx.lifecycle:lifecycle-viewmodel-compose:${Versions.Compose.viewModelLifecycle}" const val material3 = "androidx.compose.material3:material3:${Versions.Compose.material3}" const val testManifest = "androidx.compose.ui:ui-test-manifest:${Versions.Compose.base}" const val uiController = @@ -69,7 +55,6 @@ object Dependencies { object Koin { const val core = "io.insert-koin:koin-core:${Versions.Koin.base}" const val android = "io.insert-koin:koin-android:${Versions.Koin.base}" - const val compose = "io.insert-koin:koin-androidx-compose:${Versions.Koin.compose}" const val test = "io.insert-koin:koin-test:${Versions.Koin.base}" } diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 06d5392f2f1c..9ade34430627 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -15,7 +15,6 @@ object Versions { object Android { const val compileSdkVersion = 34 - const val material = "1.9.0" const val minSdkVersion = 26 const val targetSdkVersion = 34 const val volley = "1.2.1" @@ -25,12 +24,7 @@ object Versions { const val appcompat = "1.6.1" const val coreKtx = "1.9.0" const val constraintlayout = "2.1.4" - const val coordinatorlayout = "1.2.0" - const val espresso = "3.5.1" const val lifecycle = "2.6.1" - const val fragment = "1.6.1" - const val recyclerview = "1.3.1" - const val junit = "1.1.4" const val test = "1.5.0" const val testMonitor = "1.6.1" const val testOrchestrator = "1.4.2" @@ -44,7 +38,6 @@ object Versions { const val foundation = base const val material3 = "1.1.1" const val uiController = "0.30.1" - const val viewModelLifecycle = "2.6.1" } object Plugin { diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts index 255459f45324..c29b8d8a4620 100644 --- a/android/lib/billing/build.gradle.kts +++ b/android/lib/billing/build.gradle.kts @@ -42,9 +42,6 @@ dependencies { implementation(Dependencies.Kotlin.stdlib) implementation(Dependencies.KotlinX.coroutinesAndroid) - implementation(Dependencies.Koin.core) - implementation(Dependencies.Koin.android) - //Billing library implementation(Dependencies.billingClient) @@ -71,6 +68,4 @@ dependencies { androidTestImplementation(Dependencies.KotlinX.coroutinesTest) androidTestImplementation(Dependencies.turbine) androidTestImplementation(Dependencies.junit) - androidTestImplementation(Dependencies.AndroidX.espressoContrib) - androidTestImplementation(Dependencies.AndroidX.espressoCore) } diff --git a/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt b/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt index 85982007b8ae..e6f5225740a8 100644 --- a/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt +++ b/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt @@ -38,9 +38,6 @@ import org.junit.After import org.junit.Before import org.junit.Rule import org.junit.Test -import org.koin.core.context.startKoin -import org.koin.core.context.stopKoin -import org.koin.dsl.module class BillingRepositoryTest { @get:Rule val testCoroutineRule = TestCoroutineRule() @@ -56,8 +53,6 @@ class BillingRepositoryTest { @Before fun setUp() { - startKoin { modules(module { single { mockk() } }) } - mockkStatic(BILLING_CLIENT_CLASS) mockkStatic(BILLING_CLIENT_KOTLIN_CLASS) mockkStatic(BILLING_FLOW_PARAMS) @@ -74,7 +69,6 @@ class BillingRepositoryTest { @After fun tearDown() { unmockkAll() - stopKoin() } @Test diff --git a/android/lib/ipc/build.gradle.kts b/android/lib/ipc/build.gradle.kts index 0c6213e889cb..85b15dacafda 100644 --- a/android/lib/ipc/build.gradle.kts +++ b/android/lib/ipc/build.gradle.kts @@ -28,7 +28,6 @@ android { } dependencies { - implementation(project(Dependencies.Mullvad.commonLib)) implementation(project(Dependencies.Mullvad.modelLib)) implementation(Dependencies.Kotlin.stdlib) diff --git a/android/service/build.gradle.kts b/android/service/build.gradle.kts index 6b9c76f0b352..ebf48d22fdc8 100644 --- a/android/service/build.gradle.kts +++ b/android/service/build.gradle.kts @@ -51,10 +51,8 @@ dependencies { implementation(project(Dependencies.Mullvad.endpointLib)) implementation(project(Dependencies.Mullvad.ipcLib)) implementation(project(Dependencies.Mullvad.modelLib)) - implementation(project(Dependencies.Mullvad.resourceLib)) implementation(project(Dependencies.Mullvad.talpidLib)) - implementation(Dependencies.AndroidX.appcompat) implementation(Dependencies.jodaTime) implementation(Dependencies.Koin.core) implementation(Dependencies.Koin.android)