Merge branch 'develop' into feature/analytic_across_the_app

appunite · Dec 11, 2023 · af8ad43 · af8ad43
2 parents 1ecd3ac + c6ef94d
commit af8ad43
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 128 deletions.
diff --git a/.github/workflows/run-code-quality-check.yml b/.github/workflows/run-code-quality-check.yml
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,3 @@ google-services.json
 
 # Android Profiling
 *.hprof
-
-# MegaLinter files
-**/megalinter-reports/*
diff --git a/.mega-linter.yml b/.mega-linter.yml
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ktlint.gradle)
     alias(libs.plugins.kotlin.serialization)
+    id 'jacoco'
 }
 
 def fileName = "../app/google-services.json"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,19 +11,19 @@ espressoCore = "3.5.1"
 firebaseBom = "32.4.0"
 googleServices = "4.4.0"
 junit = "4.13.2"
-junitBom = "5.10.0"
+junitBom = "5.10.1"
 junitVersion = "1.1.5"
 koin = "3.5.0"
 kotlinxCoroutines = "1.7.3"
 kotlinxDatetime = "0.4.1"
 kotlinxDatetimeVersion = "0.4.1"
 kotlinxSerializationJson = "1.6.0"
-kotlinxSerializationJsonVersion = "1.6.0"
+kotlinxSerializationJsonVersion = "1.6.1"
 ktlintRuleEngineCore = "1.0.1"
 ktor = "2.3.5"
 ktx = "1.12.0"
 lifecycleKtx = "2.6.2"
-lottieCompose = "5.2.0"
+lottieCompose = "6.2.0"
 mockwebserver = "4.11.0"
 mockkAndroid = "1.13.5"
 okhttp3 = "4.12.0"