From 9dc692394dcc96858556bed7a142219980a35c56 Mon Sep 17 00:00:00 2001 From: Lucas Zborowski Date: Thu, 12 Dec 2024 15:10:13 +0100 Subject: [PATCH] revert a79969f88a551439f77328a72dfcc75c8b585ce1 revert Merge remote-tracking branch 'origin/feat(CON-173)' into feat(CON-173) # Conflicts: # build.gradle.kts # gradle/libs.versions.toml --- app/build.gradle.kts | 8 +--- build.gradle.kts | 10 ++--- consentium/build.gradle.kts | 2 +- .../consentium/api/model/VendorIdentifier.kt | 3 ++ gradle/libs.versions.toml | 38 +++++-------------- 5 files changed, 18 insertions(+), 43 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3f7c1b0..3cc05da 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -60,10 +60,7 @@ 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 { @@ -95,9 +92,6 @@ 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)) diff --git a/build.gradle.kts b/build.gradle.kts index 986ddcd..bdfca01 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,16 +15,12 @@ plugins { // Agp alias(libs.plugins.android.library) apply false - // Hilt + //Hilt alias(libs.plugins.hilt) apply false - // Kotlin serialization + + //Kotlin serialization alias(libs.plugins.serialization) apply false - // Firebase crashlytics - alias(libs.plugins.firebaseCrashlytics) apply false - - // Google services - alias(libs.plugins.googleServices) apply false } \ No newline at end of file diff --git a/consentium/build.gradle.kts b/consentium/build.gradle.kts index 2290378..e020f67 100644 --- a/consentium/build.gradle.kts +++ b/consentium/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { ksp(libs.hilt.compiler) // Serialization - implementation(libs.kotlin.serialization) + implementation(libs.serializationJson) // Retrofit api(libs.retrofit) diff --git a/consentium/src/main/java/fr/openium/consentium/api/model/VendorIdentifier.kt b/consentium/src/main/java/fr/openium/consentium/api/model/VendorIdentifier.kt index 65b1b70..e5b4908 100644 --- a/consentium/src/main/java/fr/openium/consentium/api/model/VendorIdentifier.kt +++ b/consentium/src/main/java/fr/openium/consentium/api/model/VendorIdentifier.kt @@ -4,6 +4,7 @@ enum class VendorIdentifier { CRASHLYTICS, MATOMO, GA4, + PIANO, CLARITY, UNKNOWN; @@ -13,6 +14,7 @@ enum class VendorIdentifier { "vendor-crashlytics" -> CRASHLYTICS "vendor-matomo" -> MATOMO "vendor-ga4" -> GA4 + "vendor-piano" -> PIANO else -> UNKNOWN } } @@ -22,6 +24,7 @@ enum class VendorIdentifier { CRASHLYTICS -> "vendor-crashlytics" MATOMO -> "vendor-matomo" GA4 -> "vendor-ga4" + PIANO -> "vendor-piano" else -> "vendor-unknown" } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 97650ee..40b9228 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,8 +27,8 @@ timber = "5.0.1" material = "1.12.0" # Serialization -serialization = "2.0.0" -jsonSerialization = "1.7.1" +serialization = "2.0.21" +jsonSerialization = "1.7.3" # Retrofit retrofit = "2.11.0" @@ -48,26 +48,13 @@ preferencesDataStore = "1.1.1" # Plugins agp = "8.7.3" kotlin = "2.0.0" -ksp = "2.0.0-1.0.24" +ksp = "2.0.0-1.0.23" 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 @@ -98,8 +85,11 @@ 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 = "jsonSerialization" } +kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } # Compose navigation androidx-navigation-common-ktx = { group = "androidx.navigation", name = "navigation-common-ktx", version.ref = "navigationCompose" } @@ -109,6 +99,9 @@ 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" } @@ -124,15 +117,6 @@ 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" } @@ -141,8 +125,6 @@ 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"]