From f34ca109d8366bfebc2723c2ca002318b0cb3f4a Mon Sep 17 00:00:00 2001 From: LooKeR Date: Sun, 8 Jun 2025 17:48:24 +0530 Subject: [PATCH] chore: Upgrade deps and fix merge issues --- app/build.gradle.kts | 11 +++++----- .../kotlin/com/looker/droidify/Droidify.kt | 4 ++-- .../datastore/PreferenceSettingsRepository.kt | 2 +- .../droidify/ui/tabsFragment/TabsViewModel.kt | 5 +---- build.gradle.kts | 2 -- gradle.properties | 2 +- gradle/libs.versions.toml | 22 +++++++++---------- 7 files changed, 21 insertions(+), 27 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3cae340c..8aaa95b0 100644 --- a/app/build.gradle.kts +++ b/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 = HashSet() // in /res are (almost) all languages that have a translated string is saved. this is safer and saves some time diff --git a/app/src/main/kotlin/com/looker/droidify/Droidify.kt b/app/src/main/kotlin/com/looker/droidify/Droidify.kt index 90e73997..6ba556c1 100644 --- a/app/src/main/kotlin/com/looker/droidify/Droidify.kt +++ b/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() { diff --git a/app/src/main/kotlin/com/looker/droidify/datastore/PreferenceSettingsRepository.kt b/app/src/main/kotlin/com/looker/droidify/datastore/PreferenceSettingsRepository.kt index ad22ba25..31e3b422 100644 --- a/app/src/main/kotlin/com/looker/droidify/datastore/PreferenceSettingsRepository.kt +++ b/app/src/main/kotlin/com/looker/droidify/datastore/PreferenceSettingsRepository.kt @@ -37,7 +37,7 @@ class PreferenceSettingsRepository( override val data: Flow = 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 } diff --git a/app/src/main/kotlin/com/looker/droidify/ui/tabsFragment/TabsViewModel.kt b/app/src/main/kotlin/com/looker/droidify/ui/tabsFragment/TabsViewModel.kt index 606637a7..9e010452 100644 --- a/app/src/main/kotlin/com/looker/droidify/ui/tabsFragment/TabsViewModel.kt +++ b/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, 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 diff --git a/build.gradle.kts b/build.gradle.kts index 8b8e63c8..6c911422 100644 --- a/build.gradle.kts +++ b/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 diff --git a/gradle.properties b/gradle.properties index 90518766..df136f37 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d780f2c..cb007c72 100644 --- a/gradle/libs.versions.toml +++ b/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"