diff --git a/android/app/build.gradle b/android/app/build.gradle index 153a40da1..1268e491b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -315,6 +315,8 @@ dependencies { coreLibraryDesugaring libs.android.tools.desugar // Google Play Location Services + // TODO(@pastk): enabled via microG in all flavors, + // so move google/java/app/organicmaps/location/* into main/ and remove symlinks. // // Please add symlinks to google/java/app/organicmaps/location for each new gms-enabled flavor below: // ``` @@ -323,12 +325,8 @@ dependencies { // ls -la src/$flavor/java/app/organicmaps/location/GoogleFusedLocationProvider.java // ``` // - webImplementation libs.google.services.location - googleImplementation libs.google.services.location - huaweiImplementation libs.google.services.location - // This is the microG project's re-implementation which is permissible on - // F-droid because it's Apache-2.0. - fdroidImplementation libs.microg.services.location + // microG project's FOSS re-implementation of the proprietary libs.google.services.location + implementation libs.microg.services.location // This line is added as a workaround for duplicate classes error caused by some outdated dependency: // > A failure occurred while executing com.android.build.gradle.internal.tasks.CheckDuplicatesRunnable diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index cbc7eda7b..84c1111d4 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -8,7 +8,6 @@ google-services = { module = "com.google.gms:google-services", version = "4.4.2" triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.10.1" } huawei-publish = { module = "ru.cian:huawei-publish-gradle-plugin", version = "1.4.2" } android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.4" } -google-services-location = { module = "com.google.android.gms:play-services-location", version = "21.3.0" } microg-services-location = { module = "org.microg.gms:play-services-location", version = "0.3.6.244735" } androidx-core = { module = "androidx.core:core", version = "1.15.0" } jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.1.10" }