summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2024-06-25 12:03:50 +0200
committerAlbin <albin@mullvad.net>2024-06-26 12:58:47 +0200
commit859983aa0b7716d3737353768850e1fb3d98e74e (patch)
tree59460f53989437cf7e8462c20203db2fe02b8664
parentac70101c713139244221889a61e96ecf9a56c9c6 (diff)
downloadmullvadvpn-859983aa0b7716d3737353768850e1fb3d98e74e.tar.xz
mullvadvpn-859983aa0b7716d3737353768850e1fb3d98e74e.zip
Add kermit dependency
-rw-r--r--android/app/build.gradle.kts1
-rw-r--r--android/buildSrc/src/main/kotlin/Dependencies.kt1
-rw-r--r--android/buildSrc/src/main/kotlin/Versions.kt1
-rw-r--r--android/lib/daemon-grpc/build.gradle.kts1
-rw-r--r--android/lib/map/build.gradle.kts6
-rw-r--r--android/lib/shared/build.gradle.kts1
-rw-r--r--android/lib/talpid/build.gradle.kts3
-rw-r--r--android/service/build.gradle.kts1
-rw-r--r--android/test/common/build.gradle.kts1
-rw-r--r--android/test/e2e/build.gradle.kts1
-rw-r--r--android/test/mockapi/build.gradle.kts1
-rw-r--r--android/tile/build.gradle.kts1
12 files changed, 14 insertions, 5 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 8e523ecb39..3e99a3c7ab 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -339,6 +339,7 @@ dependencies {
ksp(Dependencies.Compose.destinationsKsp)
implementation(Dependencies.jodaTime)
+ implementation(Dependencies.kermit)
implementation(Dependencies.Koin.core)
implementation(Dependencies.Koin.android)
implementation(Dependencies.Koin.compose)
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index 26b1a03753..2b5a2c430a 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -11,6 +11,7 @@ object Dependencies {
"de.mannodermaus.junit5:android-test-extensions:${Versions.Android.junit}"
const val junitAndroidTestRunner =
"de.mannodermaus.junit5:android-test-runner:${Versions.Android.junit}"
+ const val kermit = "co.touchlab:kermit:${Versions.kermit}"
const val konsist = "com.lemonappdev:konsist:${Versions.konsist}"
const val leakCanary = "com.squareup.leakcanary:leakcanary-android:${Versions.leakCanary}"
const val mockkWebserver = "com.squareup.okhttp3:mockwebserver:${Versions.mockWebserver}"
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 24f9425478..592bfeaef5 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -3,6 +3,7 @@ object Versions {
const val jodaTime = "2.12.7"
const val junit = "5.10.2"
const val jvmTarget = "17"
+ const val kermit = "2.0.4"
const val konsist = "0.14.0"
const val kotlin = "1.9.24"
const val kotlinCompilerExtensionVersion = "1.5.14"
diff --git a/android/lib/daemon-grpc/build.gradle.kts b/android/lib/daemon-grpc/build.gradle.kts
index ff5d75aa16..840de57984 100644
--- a/android/lib/daemon-grpc/build.gradle.kts
+++ b/android/lib/daemon-grpc/build.gradle.kts
@@ -59,6 +59,7 @@ dependencies {
implementation(project(Dependencies.Mullvad.talpidLib))
implementation(Dependencies.jodaTime)
+ implementation(Dependencies.kermit)
implementation(Dependencies.Kotlin.stdlib)
implementation(Dependencies.KotlinX.coroutinesCore)
implementation(Dependencies.KotlinX.coroutinesAndroid)
diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts
index 7ca04c16da..f4606de5bd 100644
--- a/android/lib/map/build.gradle.kts
+++ b/android/lib/map/build.gradle.kts
@@ -35,12 +35,10 @@ android {
}
dependencies {
-
- //Model
implementation(project(Dependencies.Mullvad.modelLib))
+ implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
implementation(Dependencies.Compose.ui)
implementation(Dependencies.Compose.foundation)
-
- implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
+ implementation(Dependencies.kermit)
}
diff --git a/android/lib/shared/build.gradle.kts b/android/lib/shared/build.gradle.kts
index 88b5cfb3c9..a1bf4a9c75 100644
--- a/android/lib/shared/build.gradle.kts
+++ b/android/lib/shared/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
implementation(project(Dependencies.Mullvad.modelLib))
implementation(Dependencies.Arrow.core)
+ implementation(Dependencies.kermit)
implementation(Dependencies.Kotlin.stdlib)
implementation(Dependencies.KotlinX.coroutinesAndroid)
implementation(Dependencies.jodaTime)
diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts
index 00409f9482..b8426e3a81 100644
--- a/android/lib/talpid/build.gradle.kts
+++ b/android/lib/talpid/build.gradle.kts
@@ -27,7 +27,8 @@ android {
dependencies {
implementation(project(Dependencies.Mullvad.modelLib))
+ implementation(Dependencies.AndroidX.lifecycleService)
+ implementation(Dependencies.kermit)
implementation(Dependencies.Kotlin.stdlib)
implementation(Dependencies.KotlinX.coroutinesAndroid)
- implementation(Dependencies.AndroidX.lifecycleService)
}
diff --git a/android/service/build.gradle.kts b/android/service/build.gradle.kts
index 2dcedca5d8..0927cde58b 100644
--- a/android/service/build.gradle.kts
+++ b/android/service/build.gradle.kts
@@ -60,6 +60,7 @@ dependencies {
implementation(Dependencies.AndroidX.coreKtx)
implementation(Dependencies.AndroidX.lifecycleService)
implementation(Dependencies.Arrow.core)
+ implementation(Dependencies.kermit)
implementation(Dependencies.Koin.android)
implementation(Dependencies.Koin.core)
implementation(Dependencies.Kotlin.stdlib)
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index df9dea41ab..84a7a46c9c 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -48,6 +48,7 @@ dependencies {
implementation(Dependencies.AndroidX.testRules)
implementation(Dependencies.AndroidX.testUiAutomator)
implementation(Dependencies.junitEngine)
+ implementation(Dependencies.kermit)
implementation(Dependencies.Kotlin.stdlib)
androidTestUtil(Dependencies.AndroidX.testOrchestrator)
diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index ce80697240..f7afe1b3af 100644
--- a/android/test/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -134,6 +134,7 @@ dependencies {
implementation(Dependencies.AndroidX.testRules)
implementation(Dependencies.AndroidX.testUiAutomator)
implementation(Dependencies.androidVolley)
+ implementation(Dependencies.kermit)
implementation(Dependencies.junitAndroidTestExtensions)
implementation(Dependencies.junitApi)
implementation(Dependencies.junitAndroidTestCore)
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts
index 10fd4ca99d..69991d24bb 100644
--- a/android/test/mockapi/build.gradle.kts
+++ b/android/test/mockapi/build.gradle.kts
@@ -78,6 +78,7 @@ dependencies {
implementation(Dependencies.AndroidX.testRunner)
implementation(Dependencies.AndroidX.testRules)
implementation(Dependencies.AndroidX.testUiAutomator)
+ implementation(Dependencies.kermit)
implementation(Dependencies.jodaTime)
implementation(Dependencies.junitAndroidTestExtensions)
implementation(Dependencies.junitApi)
diff --git a/android/tile/build.gradle.kts b/android/tile/build.gradle.kts
index 0b2aab45f5..ecd1884e2d 100644
--- a/android/tile/build.gradle.kts
+++ b/android/tile/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
implementation(Dependencies.Koin.android)
implementation(Dependencies.AndroidX.appcompat)
+ implementation(Dependencies.kermit)
implementation(Dependencies.Kotlin.stdlib)
implementation(Dependencies.KotlinX.coroutinesAndroid)
}