chore: Upgrade deps and fix merge issues

app/build.gradle.kts

@@ -36,7 +36,7 @@ android {
             "-opt-in=kotlin.RequiresOptIn",
             "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
             "-opt-in=kotlinx.coroutines.FlowPreview",
-            "-Xcontext-receivers"
+            "-Xcontext-receivers",
         )
     }
 
@@ -60,7 +60,7 @@ android {
             resValue("string", "application_name", "Droid-ify")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard.pro"
+                "proguard.pro",
             )
         }
         create("alpha") {
@@ -69,7 +69,7 @@ android {
             resValue("string", "application_name", "Droid-ify Alpha")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard.pro"
+                "proguard.pro",
             )
             isDebuggable = true
             isMinifyEnabled = true
@@ -78,7 +78,7 @@ android {
             buildConfigField(
                 type = "String",
                 name = "VERSION_NAME",
-                value = "\"v$latestVersionName\""
+                value = "\"v$latestVersionName\"",
             )
         }
     }
@@ -160,7 +160,8 @@ dependencies {
 }
 
 // using a task as a preBuild dependency instead of a function that takes some time insures that it runs
-task("detectAndroidLocals") {
+// in /res are (almost) all languages that have a translated string is saved. this is safer and saves some time
+tasks.register("detectAndroidLocals") {
     val langsList: MutableSet<String> = HashSet()
 
     // in /res are (almost) all languages that have a translated string is saved. this is safer and saves some time

app/src/main/kotlin/com/looker/droidify/Droidify.kt

@@ -84,13 +84,13 @@ class Droidify : Application(), SingletonImageLoader.Factory, Configuration.Prov
 
         val databaseUpdated = Database.init(this)
         ProductPreferences.init(this, appScope)
-//        RepositoryUpdater.init(appScope, downloader)
+        RepositoryUpdater.init(appScope, downloader)
         listenApplications()
         checkLanguage()
         updatePreference()
         appScope.launch { installer() }
 
-//        if (databaseUpdated) forceSyncAll()
+        if (databaseUpdated) forceSyncAll()
     }
 
     override fun onTerminate() {

app/src/main/kotlin/com/looker/droidify/datastore/PreferenceSettingsRepository.kt

@@ -37,7 +37,7 @@ class PreferenceSettingsRepository(
     override val data: Flow<Settings> = dataStore.data
         .catch { exception ->
             if (exception is IOException) {
-                Log.e("TAG", "Error reading preferences.", exception)
+                Log.e("PreferencesSettingsRepository", "Error reading preferences.", exception)
             } else {
                 throw exception
             }

app/src/main/kotlin/com/looker/droidify/ui/tabsFragment/TabsViewModel.kt

@@ -7,7 +7,6 @@ import com.looker.droidify.database.Database
 import com.looker.droidify.datastore.SettingsRepository
 import com.looker.droidify.datastore.get
 import com.looker.droidify.datastore.model.SortOrder
-import com.looker.droidify.domain.model.Fingerprint
 import com.looker.droidify.model.ProductItem
 import com.looker.droidify.ui.tabsFragment.TabsFragment.BackAction
 import com.looker.droidify.utility.common.extension.asStateFlow
@@ -21,8 +20,6 @@ import javax.inject.Inject
 @HiltViewModel
 class TabsViewModel @Inject constructor(
     private val settingsRepository: SettingsRepository,
-    private val indexDao: IndexDao,
-    private val syncable: Syncable<IndexV2>,
     private val savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
@@ -63,7 +60,7 @@ class TabsViewModel @Inject constructor(
     val backAction = combine(
         currentSection,
         isSearchActionItemExpanded,
-        showSections
+        showSections,
     ) { currentSection, isSearchActionItemExpanded, showSections ->
         when {
             currentSection != ProductItem.Section.All -> BackAction.ProductAll

build.gradle.kts

@@ -1,8 +1,6 @@
 plugins {
 	alias(libs.plugins.android.application) apply false
 	alias(libs.plugins.kotlin.android) apply false
-	alias(libs.plugins.ksp) apply false
-	alias(libs.plugins.hilt) apply false
 	alias(libs.plugins.kotlin.serialization) apply false
 	alias(libs.plugins.kotlin.parcelize) apply false
 	alias(libs.plugins.hilt) apply false

gradle.properties

@@ -11,7 +11,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 #Sun Sep 11 10:12:12 IST 2022
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx6g -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
+org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
 android.useAndroidX=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true

gradle/libs.versions.toml

@@ -1,28 +1,26 @@
 [versions]
 desugaring = "2.1.5"
-agp = "8.9.2"
+agp = "8.10.1"
 material = "1.12.0"
 activity = "1.10.1"
-app-compat = "1.7.0"
+app-compat = "1.7.1"
 core = "1.16.0"
-datastore = "1.1.5"
-fragment = "1.8.6"
-espresso = "3.6.1"
-lifecycle = "2.8.7"
+datastore = "1.1.7"
+fragment = "1.8.8"
+lifecycle = "2.9.1"
 recycler-view = "1.4.0"
-sqlite = "2.5.0"
+sqlite = "2.5.1"
 test-ext = "1.2.1"
 test-rules = "1.6.1"
 test-runner = "1.6.2"
-ui-automator = "2.3.0"
 work = "2.10.1"
-coil = "3.1.0"
+coil = "3.2.0"
 leakcanary = "2.14"
-hilt = "2.56.1"
+hilt = "2.56.2"
 hiltExt = "1.2.0"
 jackson = "2.18.2"
-kotlin = "2.1.20"
-coroutines = "1.10.1"
+kotlin = "2.1.21"
+coroutines = "1.10.2"
 datetime = "0.6.2"
 serialization = "1.8.1"
 ksp = "2.1.20-1.0.32"