Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused dependencies #5523

Merged
merged 2 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
10 changes: 0 additions & 10 deletions android/buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -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}"
Expand All @@ -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 =
Expand All @@ -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 =
Expand Down
5 changes: 0 additions & 5 deletions android/buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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 {
Expand Down
Loading