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

# Conflicts:
#	build.gradle.kts
#	gradle/libs.versions.toml

app/build.gradle.kts

@@ -60,7 +60,10 @@ android {
             isShrinkResources = true
 
             signingConfig = signingConfigs.getByName(BuildType.RELEASE.name)
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
     compileOptions {
@@ -92,6 +95,9 @@ dependencies {
     ksp(libs.hilt.compiler)
     implementation(libs.hilt.navigation.compose)
     implementation(libs.matomo)
+    implementation(libs.clarity)
+    implementation(libs.ga4)
+
 
     // Compose
     implementation(platform(libs.compose.bom))

build.gradle.kts

@@ -18,9 +18,13 @@ plugins {
     // Hilt
     alias(libs.plugins.hilt) apply false
 
-
     // Kotlin serialization
     alias(libs.plugins.serialization) apply false
 
+    // Firebase crashlytics
+    alias(libs.plugins.firebaseCrashlytics) apply false
+
+    // Google services
+    alias(libs.plugins.googleServices) apply false
 
 }

consentium/build.gradle.kts

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

consentium/src/main/java/fr/openium/consentium/api/model/VendorIdentifier.kt

@@ -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"
     }
 }

gradle/libs.versions.toml

@@ -27,8 +27,8 @@ timber = "5.0.1"
 material = "1.12.0"
 
 # Serialization
-serialization = "2.0.21"
-jsonSerialization = "1.7.3"
+serialization = "2.0.0"
+jsonSerialization = "1.7.1"
 
 # Retrofit
 retrofit = "2.11.0"
@@ -48,13 +48,26 @@ preferencesDataStore = "1.1.1"
 # Plugins
 agp = "8.7.3"
 kotlin = "2.0.0"
-ksp = "2.0.0-1.0.23"
+ksp = "2.0.0-1.0.24"
 junitVersion = "1.2.1"
+googleServicesPlugin = "4.4.2"
 
 # Matomo
 matomo = "4.3"
+
+# Compose navigation
 navigationCompose = "2.8.2"
 
+# Crashlytics
+firebaseCrashlyticsPlugin = "3.0.2"
+firebaseCrashlyticsKtx = "19.2.0"
+
+# Clarity
+clarityVersion = "1.3.2"
+
+# GA4
+ga4 = "22.1.2"
+
 [libraries]
 
 # AndroidX
@@ -85,11 +98,8 @@ compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 # Material
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
-# Matomo
-matomo = { module = "com.github.matomo-org:matomo-sdk-android", version.ref = "matomo" }
-
 # Kotlin serizalization
-kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
+kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "jsonSerialization" }
 
 # Compose navigation
 androidx-navigation-common-ktx = { group = "androidx.navigation", name = "navigation-common-ktx", version.ref = "navigationCompose" }
@@ -99,9 +109,6 @@ androidx-navigation-compose = { group = "androidx.navigation", name = "navigatio
 # Preferences DataStore
 preferencesDataStore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "preferencesDataStore" }
 
-# Json serialization
-serializationJson = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "jsonSerialization" }
-
 # Retrofit
 retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
 retrofitConverter = { group = "com.squareup.retrofit2", name = "converter-kotlinx-serialization", version.ref = "retrofit" }
@@ -117,6 +124,15 @@ test-androidx-junit = { group = "androidx.test.ext", name = "junit-ktx", version
 test-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 
+# Matomo
+matomo = { module = "com.github.matomo-org:matomo-sdk-android", version.ref = "matomo" }
+
+# Clarity
+clarity = { group = "com.microsoft.clarity", name = "clarity", version.ref = "clarityVersion" }
+
+# GA4 (Firebase Analytics)
+ga4 = { module = "com.google.firebase:firebase-analytics", version.ref = "ga4" }
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
@@ -125,6 +141,8 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization" }
+firebaseCrashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }
+googleServices = { id = "com.google.gms.google-services", version.ref = "googleServicesPlugin" }
 
 [bundles]
 androidx = ["androidx-core-ktx", "androidx-activity-compose"]