summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2023-12-04 09:58:15 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-01-02 11:40:59 +0100
commit567ee21cae56c90daeb0ef6bd7708e75a40feba2 (patch)
tree1b300ef33f394e2a60f0e9d707bc1de6a06ab9e4
parentcdd8c97f878c20a7a6457bdeeef9b2abce0a737d (diff)
downloadmullvadvpn-567ee21cae56c90daeb0ef6bd7708e75a40feba2.tar.xz
mullvadvpn-567ee21cae56c90daeb0ef6bd7708e75a40feba2.zip
Remove unused dependencies
-rw-r--r--android/app/build.gradle.kts12
-rw-r--r--android/buildSrc/src/main/kotlin/Dependencies.kt10
-rw-r--r--android/buildSrc/src/main/kotlin/Versions.kt5
-rw-r--r--android/lib/billing/build.gradle.kts4
-rw-r--r--android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt6
-rw-r--r--android/lib/ipc/build.gradle.kts1
-rw-r--r--android/service/build.gradle.kts2
7 files changed, 1 insertions, 39 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 51673f611c..a49db33415 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -182,8 +182,7 @@ android {
val enableInAppVersionNotifications =
gradleLocalProperties(rootProject.projectDir)
- .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS")
- ?: "true"
+ .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") ?: "true"
buildConfigField(
"boolean",
@@ -321,19 +320,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)
@@ -358,7 +351,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)
@@ -370,8 +362,6 @@ dependencies {
// 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 a77e8798cc..8e38491f41 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,15 @@ 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 =
@@ -52,8 +44,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 =
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 01e82fa403..fede1556f7 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,9 @@ 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"
@@ -45,7 +41,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 255459f453..8ecc14f7cd 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,5 @@ 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 85982007b8..e6f5225740 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<Activity>() } }) }
-
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 0c6213e889..85b15dacaf 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 6b9c76f0b3..ebf48d22fd 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)