openium/consentium.droid
0
0
Fork 0
Code Pull Requests Releases Activity

revert a79969f88a

Browse Source 
revert 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:
Lucas Zborowski
2024-12-12 15:10:13 +01:00
parent a79969f88a
commit 9dc692394d
5 changed files with 18 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gradle/libs.versions.toml
View File

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