Merge pull request #2963 from kiwix/develop

Merging changes to master.
kiwix · Aug 18, 2022 · 824b3f9 · 824b3f9
2 parents c04edd5 + f719601
commit 824b3f9
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 25 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -66,4 +66,4 @@ jobs:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
           KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-        run: ./gradlew publishPlayStoreBundle
+        run: ./gradlew publishPlayStoreBundle --scan
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
@@ -420,10 +420,4 @@ object Libs {
    * https://developer.android.com/testing
    */
   const val junit: String = "androidx.test.ext:junit:" + Versions.junit
-
-  /**
-   * https://developer.android.com/reference/com/google/android/play/core/release-notes
-   */
-  const val google_android_play_core: String =
-    "com.google.android.play:core:" + Versions.google_android_play_core
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -12,8 +12,6 @@ import org.gradle.plugin.use.PluginDependencySpec
  */
 object Versions {
 
-  const val google_android_play_core: String = "1.7.3"
-
   const val document_file_version: String = "1.0.1"
 
   const val org_jetbrains_kotlinx_kotlinx_coroutines: String = "1.4.1"

diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -204,7 +204,6 @@ class AllProjectConfigurer {
       implementation(Libs.rxandroid)
       implementation(Libs.rxjava)
       implementation(Libs.preference_ktx)
-      implementation(Libs.google_android_play_core)
     }
   }
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt
@@ -17,7 +17,6 @@
  */
 package org.kiwix.kiwixmobile.core
 
-import android.app.AlertDialog
 import android.app.Application
 import android.content.Context
 import android.os.Build
@@ -26,7 +25,6 @@ import android.os.Environment.getExternalStorageState
 import android.os.StrictMode
 import android.os.StrictMode.VmPolicy
 import androidx.multidex.MultiDex
-import com.google.android.play.core.missingsplits.MissingSplitsManagerFactory
 import com.jakewharton.threetenabp.AndroidThreeTen
 import org.kiwix.kiwixmobile.core.data.local.KiwixDatabase
 import org.kiwix.kiwixmobile.core.di.components.CoreComponent
@@ -78,15 +76,6 @@ abstract class CoreApp : Application() {
   }
 
   override fun onCreate() {
-    if (MissingSplitsManagerFactory.create(this).disableAppIfMissingRequiredSplits()) {
-      AlertDialog.Builder(this)
-        .setMessage(R.string.missing_split_version_for_objectbox)
-        .setPositiveButton(R.string.yes) { _, _ ->
-          android.os.Process.killProcess(android.os.Process.myPid())
-        }
-        .show()
-      return
-    }
     super.onCreate()
     instance = this
     coreComponent = DaggerCoreComponent.builder()

diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
@@ -315,5 +315,4 @@
   <string name="open_article">Ouvrir l’article</string>
   <string name="delete_note_dialog_message">Remarque : les notes ne sont pas supprimées de votre espace de stockage</string>
   <string name="delete_selected_notes">Supprimer les notes sélectionnées ?</string>
-  <string name="missing_split_version_for_objectbox">Architecture non prise en charge, votre appareil n’est pas compatible avec cette application.</string>
 </resources>
diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml
@@ -299,5 +299,4 @@
   <string name="open_article">Отвори статија</string>
   <string name="delete_note_dialog_message">Напомена: Белешките не се избришани од вашиот склад</string>
   <string name="delete_selected_notes">Да ги избришам избраните белешки?</string>
-  <string name="missing_split_version_for_objectbox">Неподдржана архитектура. Вашито уред не е складен со прилогов</string>
 </resources>
diff --git a/core/src/main/res/values-sk/strings.xml b/core/src/main/res/values-sk/strings.xml
@@ -302,5 +302,4 @@
   <string name="open_article">Otvoriť článok</string>
   <string name="delete_note_dialog_message">Poznámka: Poznámky z vášho úložiska nie sú vymazané</string>
   <string name="delete_selected_notes">Odstrániť vybraté poznámky?</string>
-  <string name="missing_split_version_for_objectbox">Nepodporovaná architektúra, vaše zariadenie nie je kompatibilné s touto aplikáciou</string>
 </resources>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
@@ -323,5 +323,4 @@
   <string name="open_article">Open Article</string>
   <string name="delete_note_dialog_message">Note: Notes are not deleted from your storage</string>
   <string name="delete_selected_notes">Delete Selected Notes?</string>
-  <string name="missing_split_version_for_objectbox">Un-Supported architecture, your device isn\'t compatible with this app</string>
 </resources>