Merge remote-tracking branch 'origin/feat(CON-173)' into feat(CON-173)

# Conflicts:
#	build.gradle.kts
#	gradle/libs.versions.toml
This commit is contained in:
2024-12-12 15:04:57 +01:00
5 changed files with 43 additions and 18 deletions

View File

@ -45,7 +45,7 @@ dependencies {
ksp(libs.hilt.compiler)
// Serialization
implementation(libs.serializationJson)
implementation(libs.kotlin.serialization)
// Retrofit
api(libs.retrofit)

View File

@ -4,7 +4,6 @@ enum class VendorIdentifier {
CRASHLYTICS,
MATOMO,
GA4,
PIANO,
CLARITY,
UNKNOWN;
@ -14,7 +13,6 @@ enum class VendorIdentifier {
"vendor-crashlytics" -> CRASHLYTICS
"vendor-matomo" -> MATOMO
"vendor-ga4" -> GA4
"vendor-piano" -> PIANO
else -> UNKNOWN
}
}
@ -24,7 +22,6 @@ enum class VendorIdentifier {
CRASHLYTICS -> "vendor-crashlytics"
MATOMO -> "vendor-matomo"
GA4 -> "vendor-ga4"
PIANO -> "vendor-piano"
else -> "vendor-unknown"
}
}