diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e75c75cf9..1f9f2150c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,4 @@ import plugin.KiwixConfigurationPlugin -import plugin.fdroidImplementation plugins { android @@ -75,13 +74,6 @@ android { initWith(getByName("debug")) setMatchingFallbacks("debug") } - create("fdroid") { // Configuration for F-Droid flavor - // dimension = "default" - initWith(getByName("release")) - matchingFallbacks += "release" - applicationIdSuffix = ".fdroid" - versionNameSuffix = "-fdroid" - } } bundle { @@ -108,17 +100,6 @@ play { dependencies { androidTestImplementation(Libs.leakcanary_android_instrumentation) - - fdroidImplementation(Libs.objectbox_kotlin) { - // Exclude specific packages or classes from ObjectBox library - exclude(group = "io.objectbox", module = "objectbox-kotlin") - } - fdroidImplementation(Libs.objectbox_rxjava) { - exclude(group = "io.objectbox", module = "objectbox-rxjava") - } - fdroidImplementation(Libs.objectbox_gradle_plugin) { - exclude(group = "io.objectbox", module = "objectbox-gradle-plugin") - } } task("generateVersionCodeAndName") { val file = File("VERSION_INFO") diff --git a/buildSrc/src/main/kotlin/plugin/ConvenienceExtensions.kt b/buildSrc/src/main/kotlin/plugin/ConvenienceExtensions.kt index edff1405e..33b2f7fb4 100644 --- a/buildSrc/src/main/kotlin/plugin/ConvenienceExtensions.kt +++ b/buildSrc/src/main/kotlin/plugin/ConvenienceExtensions.kt @@ -42,14 +42,6 @@ internal fun DependencyHandlerScope.androidTestImplementation( (it as ModuleDependency?)?.let { moduleDependency -> dependencyFunc?.invoke(moduleDependency) } } -fun DependencyHandlerScope.fdroidImplementation( - dependency: String, - dependencyFunc: (ModuleDependency.() -> Unit)? = null -) = - addDependency("fdroidImplementation", dependency).also { - (it as ModuleDependency?)?.let { moduleDependency -> dependencyFunc?.invoke(moduleDependency) } - } - internal fun DependencyHandlerScope.compileOnly(dependency: String) = addDependency("compileOnly", dependency) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 56621d1b8..fbc954a7c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -50,9 +50,6 @@ android { getByName("release") { isMinifyEnabled = false } - create("fdroid") { - initWith(getByName("release")) - } } } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/ObjectBoxToRoomMigrator.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/ObjectBoxToRoomMigrator.kt index 327d0a69a..11dcfd6df 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/ObjectBoxToRoomMigrator.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/ObjectBoxToRoomMigrator.kt @@ -24,7 +24,6 @@ import io.objectbox.kotlin.boxFor import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import org.kiwix.kiwixmobile.core.BuildConfig import org.kiwix.kiwixmobile.core.CoreApp import org.kiwix.kiwixmobile.core.dao.entities.RecentSearchEntity import org.kiwix.kiwixmobile.core.data.KiwixRoomDatabase @@ -37,12 +36,9 @@ class ObjectBoxToRoomMigrator { @Inject lateinit var sharedPreferenceUtil: SharedPreferenceUtil fun migrateObjectBoxDataToRoom() { - // Migrate data for non-fdroid variant - if (BuildConfig.BUILD_TYPE != "fdroid") { - CoreApp.coreComponent.inject(this) - migrateRecentSearch(boxStore.boxFor()) - // TODO we will migrate here for other entities - } + CoreApp.coreComponent.inject(this) + migrateRecentSearch(boxStore.boxFor()) + // TODO we will migrate here for other entities } fun migrateRecentSearch(box: Box) {