Skip to content

Commit 824b3f9

Browse files
Merge pull request #2963 from kiwix/develop
Merging changes to master.
2 parents c04edd5 + f719601 commit 824b3f9

File tree

9 files changed

+1
-25
lines changed

9 files changed

+1
-25
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ jobs:
6666
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
6767
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
6868
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
69-
run: ./gradlew publishPlayStoreBundle
69+
run: ./gradlew publishPlayStoreBundle --scan

buildSrc/src/main/kotlin/Libs.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -420,10 +420,4 @@ object Libs {
420420
* https://developer.android.com/testing
421421
*/
422422
const val junit: String = "androidx.test.ext:junit:" + Versions.junit
423-
424-
/**
425-
* https://developer.android.com/reference/com/google/android/play/core/release-notes
426-
*/
427-
const val google_android_play_core: String =
428-
"com.google.android.play:core:" + Versions.google_android_play_core
429423
}

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import org.gradle.plugin.use.PluginDependencySpec
1212
*/
1313
object Versions {
1414

15-
const val google_android_play_core: String = "1.7.3"
16-
1715
const val document_file_version: String = "1.0.1"
1816

1917
const val org_jetbrains_kotlinx_kotlinx_coroutines: String = "1.4.1"

buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ class AllProjectConfigurer {
204204
implementation(Libs.rxandroid)
205205
implementation(Libs.rxjava)
206206
implementation(Libs.preference_ktx)
207-
implementation(Libs.google_android_play_core)
208207
}
209208
}
210209
}

core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818
package org.kiwix.kiwixmobile.core
1919

20-
import android.app.AlertDialog
2120
import android.app.Application
2221
import android.content.Context
2322
import android.os.Build
@@ -26,7 +25,6 @@ import android.os.Environment.getExternalStorageState
2625
import android.os.StrictMode
2726
import android.os.StrictMode.VmPolicy
2827
import androidx.multidex.MultiDex
29-
import com.google.android.play.core.missingsplits.MissingSplitsManagerFactory
3028
import com.jakewharton.threetenabp.AndroidThreeTen
3129
import org.kiwix.kiwixmobile.core.data.local.KiwixDatabase
3230
import org.kiwix.kiwixmobile.core.di.components.CoreComponent
@@ -78,15 +76,6 @@ abstract class CoreApp : Application() {
7876
}
7977

8078
override fun onCreate() {
81-
if (MissingSplitsManagerFactory.create(this).disableAppIfMissingRequiredSplits()) {
82-
AlertDialog.Builder(this)
83-
.setMessage(R.string.missing_split_version_for_objectbox)
84-
.setPositiveButton(R.string.yes) { _, _ ->
85-
android.os.Process.killProcess(android.os.Process.myPid())
86-
}
87-
.show()
88-
return
89-
}
9079
super.onCreate()
9180
instance = this
9281
coreComponent = DaggerCoreComponent.builder()

core/src/main/res/values-fr/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,5 +315,4 @@
315315
<string name="open_article">Ouvrir l’article</string>
316316
<string name="delete_note_dialog_message">Remarque : les notes ne sont pas supprimées de votre espace de stockage</string>
317317
<string name="delete_selected_notes">Supprimer les notes sélectionnées ?</string>
318-
<string name="missing_split_version_for_objectbox">Architecture non prise en charge, votre appareil n’est pas compatible avec cette application.</string>
319318
</resources>

core/src/main/res/values-mk/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,5 +299,4 @@
299299
<string name="open_article">Отвори статија</string>
300300
<string name="delete_note_dialog_message">Напомена: Белешките не се избришани од вашиот склад</string>
301301
<string name="delete_selected_notes">Да ги избришам избраните белешки?</string>
302-
<string name="missing_split_version_for_objectbox">Неподдржана архитектура. Вашито уред не е складен со прилогов</string>
303302
</resources>

core/src/main/res/values-sk/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,5 +302,4 @@
302302
<string name="open_article">Otvoriť článok</string>
303303
<string name="delete_note_dialog_message">Poznámka: Poznámky z vášho úložiska nie sú vymazané</string>
304304
<string name="delete_selected_notes">Odstrániť vybraté poznámky?</string>
305-
<string name="missing_split_version_for_objectbox">Nepodporovaná architektúra, vaše zariadenie nie je kompatibilné s touto aplikáciou</string>
306305
</resources>

core/src/main/res/values/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,5 +323,4 @@
323323
<string name="open_article">Open Article</string>
324324
<string name="delete_note_dialog_message">Note: Notes are not deleted from your storage</string>
325325
<string name="delete_selected_notes">Delete Selected Notes?</string>
326-
<string name="missing_split_version_for_objectbox">Un-Supported architecture, your device isn\'t compatible with this app</string>
327326
</resources>

0 commit comments

Comments
 (0)