[pull] master from quran:master

.github/workflows/build.yml

@@ -14,22 +14,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Build debug APK
         run: ./gradlew assembleMadaniDebug
 
       - name: Download Previous Debug APK
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: post_merge.yml
@@ -44,7 +44,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Apk Diff Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: apk_differences
@@ -56,16 +56,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Run lint
         run: ./gradlew lintMadaniDebug
 
       - name: Upload lint results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: lint_report
@@ -77,16 +83,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Run SqlDelight migration tests
         run: ./gradlew verifySqlDelightMigration
@@ -95,7 +101,7 @@ jobs:
         run: ./gradlew test -PdisableCrashlytics -PdisableFirebase
 
       - name: Upload test report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: unit_test_report
@@ -107,22 +113,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Get dependencies list
         run: ./gradlew :app:dependencies --configuration madaniReleaseRuntimeClasspath > current_dependencies.txt
 
       - name: Download Previous Dependencies List
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: post_merge.yml
@@ -137,7 +143,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Dependency Diff Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: dependency_differences
@@ -148,7 +154,7 @@ jobs:
           echo ${{ github.event.number }} > pr.txt
 
       - name: Upload PR Number
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pr
           path: pr.txt

.github/workflows/post_build.yml

@@ -13,15 +13,15 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Download PR Number
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           run_id: ${{ github.event.workflow_run.id }}
           workflow: build.yml
           name: pr
 
       - name: Download Apk Diff Results
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           run_id: ${{ github.event.workflow_run.id }}
@@ -36,7 +36,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download Dependency Diff Results
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           run_id: ${{ github.event.workflow_run.id }}

.github/workflows/post_merge.yml

@@ -15,22 +15,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Build debug Apk
         run: ./gradlew assembleDebug
 
       - name: Upload Debug Apk
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: latest-apk
@@ -40,7 +40,7 @@ jobs:
         run: ./gradlew :app:dependencies --configuration madaniReleaseRuntimeClasspath > dependencies.txt
 
       - name: Upload dependencies list
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: dependencies

CONTRIBUTORS.md

@@ -41,7 +41,7 @@ Quran Android Contributors
 * Turkish by Mehmed Mahmudoglu.
 * Turkish updates by [Shuhrat Dehkanov](http://github.com/ozbek).
 * Russian by Rinat [Ринат Валеев](https://github.com/Valey).
-* Kurdish by [Goran Gharib Karim](https://github.com/GorranKurd).
+* Kurdish by [Goran Gharib](https://github.com/GoRaN909).
 * French by Yasser [yasserkad](http://github.com/yasserkad).
 * French updates by [Abdullah ibn Nadjo](https://github.com/abdullahibnnadjo).
 * French updates 1441 Ramadan 13 (06/05/2020) [Saïd B](https://github.com/sbou88).

app/build.gradle

@@ -1,9 +1,10 @@
 plugins {
-  id 'quran.android.application'
+  id "quran.android.application"
   id 'org.jetbrains.kotlin.kapt'
   id 'org.jetbrains.kotlin.plugin.parcelize'
-  id 'net.ltgt.errorprone'
-  id 'com.squareup.anvil'
+  alias libs.plugins.ksp
+  alias libs.plugins.errorprone
+  alias libs.plugins.anvil
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release") &&
@@ -16,11 +17,13 @@ android {
   namespace 'com.quran.labs.androidquran'
 
   defaultConfig {
-    versionCode 3320
-    versionName "3.3.2"
+    versionCode 3430
+    versionName "3.4.3"
     testInstrumentationRunner "com.quran.labs.androidquran.core.QuranTestRunner"
   }
 
+  buildFeatures.buildConfig = true
+
   signingConfigs {
     release {
       storeFile file(STORE_FILE)
@@ -30,7 +33,7 @@ android {
     }
   }
 
-  flavorDimensions "pageType"
+  flavorDimensions = ["pageType"]
   productFlavors {
     madani {
       applicationId "com.quran.labs.androidquran"
@@ -58,7 +61,7 @@ android {
     }
   }
 
-  applicationVariants.all { variant ->
+  applicationVariants.configureEach { variant ->
     resValue "string", "authority", applicationId + '.data.QuranDataProvider'
     resValue "string", "file_authority", applicationId + '.fileprovider'
     if (applicationId.endsWith("debug")) {
@@ -84,12 +87,6 @@ android {
     }
   }
 
-  lint {
-    checkReleaseBuilds true
-    enable 'Interoperability'
-    lintConfig file('lint.xml')
-  }
-
   packagingOptions {
     resources {
       excludes += ['META-INF/*.kotlin_module', 'META-INF/DEPENDENCIES', 'META-INF/INDEX.LIST']
@@ -120,68 +117,70 @@ dependencies {
   implementation project(path: ':common:download')
   implementation project(path: ':common:networking')
   implementation project(path: ':common:pages')
+  implementation project(path: ':common:preference')
   implementation project(path: ':common:reading')
   implementation project(path: ':common:recitation')
   implementation project(path: ':common:search')
   implementation project(path: ':common:toolbar')
+  implementation project(path: ':common:translation')
   implementation project(path: ':common:upgrade')
   implementation project(path: ':common:ui:core')
 
   implementation project(path: ':feature:audio')
   implementation project(path: ':feature:downloadmanager')
   implementation project(path: ':feature:qarilist')
 
-  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}"
-  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${coroutinesVersion}"
+  implementation libs.kotlinx.coroutines.core
+  implementation libs.kotlinx.coroutines.android
 
-  implementation "com.squareup.retrofit2:retrofit:${retrofitVersion}"
-  implementation "com.squareup.retrofit2:converter-moshi:${retrofitVersion}"
+  implementation libs.retrofit
+  implementation libs.converter.moshi
 
-  implementation "androidx.appcompat:appcompat:${androidxAppcompatVersion}"
-  implementation "androidx.media:media:${androidxMediaVersion}"
-  implementation "androidx.localbroadcastmanager:localbroadcastmanager:${androidxLocalBroadcastVersion}"
-  implementation "androidx.preference:preference-ktx:${androidxPreferencesVersion}"
-  implementation "androidx.recyclerview:recyclerview:${androidxRecyclerViewVersion}"
-  implementation "com.google.android.material:material:${materialComponentsVersion}"
-  implementation "androidx.swiperefreshlayout:swiperefreshlayout:${androidxSwipeRefreshVersion}"
+  implementation libs.androidx.appcompat
+  implementation libs.androidx.media
+  implementation libs.androidx.localbroadcastmanager
+  implementation libs.androidx.preference.ktx
+  implementation libs.androidx.recyclerview
+  implementation libs.material
+  implementation libs.androidx.swiperefreshlayout
 
   // okio
-  implementation "com.squareup.okio:okio:${okioVersion}"
+  implementation libs.okio
 
   // rx
-  implementation 'io.reactivex.rxjava3:rxjava:3.1.6'
-  implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
+  implementation libs.rxjava
+  implementation libs.rxandroid
 
   // dagger
-  kapt deps.dagger.apt
-  kaptTest deps.dagger.apt
-  implementation deps.dagger.runtime
+  kapt libs.dagger.compiler
+  kaptTest libs.dagger.compiler
+  implementation libs.dagger.runtime
 
   // workmanager
-  implementation "androidx.work:work-runtime-ktx:${workManagerVersion}"
+  implementation libs.androidx.work.runtime.ktx
 
-  implementation "com.squareup.okio:okio:${okioVersion}"
-  implementation "com.squareup.okhttp3:okhttp"
+  implementation libs.okhttp
 
-  implementation "com.squareup.moshi:moshi:${moshiVersion}"
-  kapt("com.squareup.moshi:moshi-kotlin-codegen:${moshiVersion}")
+  implementation libs.moshi
+  ksp(libs.moshi.codegen)
 
-  implementation "dev.chrisbanes.insetter:insetter:0.6.1"
-  implementation 'com.jakewharton.timber:timber:5.0.1'
-  debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
-  implementation 'com.google.firebase:firebase-crashlytics:18.3.6'
+  implementation libs.insetter
+  implementation libs.timber
+  debugImplementation libs.leakcanary.android
 
-  testImplementation "junit:junit:${junitVersion}"
-  testImplementation "com.google.truth:truth:${truthVersion}"
-  testImplementation "org.mockito:mockito-core:${mockitoVersion}"
-  testImplementation "com.squareup.okhttp3:mockwebserver"
-  testImplementation "androidx.test.ext:junit-ktx:${androidxJunitExtVersion}"
-  testImplementation "org.robolectric:robolectric:${robolectricVersion}"
-  testImplementation "androidx.test.espresso:espresso-core:${espressoVersion}"
-  testImplementation "androidx.test.espresso:espresso-intents:${espressoVersion}"
+  testImplementation libs.junit
+  testImplementation libs.truth
+  testImplementation libs.mockito.core
+  testImplementation libs.okhttp.mockserver
+  testImplementation libs.junit.ktx
+  testImplementation libs.robolectric
+  testImplementation libs.espresso.core
+  testImplementation libs.espresso.intents
+  testImplementation libs.turbine
+  testImplementation libs.kotlinx.coroutines.test
 
-  errorprone 'com.google.errorprone:error_prone_core:2.18.0'
+  errorprone libs.errorprone.core
 
   // Number Picker
-  implementation 'io.github.ShawnLin013:number-picker:2.4.13'
+  implementation libs.number.picker
 }