Merge branch 'main' into LanguageUtil_improve

Author: Isira-Seneviratne

.github/workflows/android.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
-    - uses: gradle/gradle-build-action@v2
+    - uses: gradle/gradle-build-action@v3
     - name: Check for missing qq strings
       run: ./scripts/missing-qq.py
     - name: Checkout submodules
@@ -47,7 +47,7 @@ jobs:
     - name: Sleep for 30 seconds, to allow the tag to be deleted
       run: sleep 30s
       shell: bash
-    - uses: ncipollo/release-action@v1.12.0
+    - uses: ncipollo/release-action@v1.13.0
       name: Create new tag and release and upload artifacts
       with:
         name: latest

.github/workflows/android_branch.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
-    - uses: gradle/gradle-build-action@v2
+    - uses: gradle/gradle-build-action@v3
     - name: Checkout submodules
       run: git submodule update --init --recursive
     - name: Build, test, and lint
@@ -33,7 +33,7 @@ jobs:
       env:
         # override default build-tools version (29.0.3) -- optional
         BUILD_TOOLS_VERSION: "34.0.0"
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       name: Upload APK artifact
       with:
         name: app_alpha_release

.github/workflows/android_pr.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: gradle/wrapper-validation-action@v1
-    - uses: actions/setup-java@v3
+    - uses: gradle/wrapper-validation-action@v2
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
-    - uses: gradle/gradle-build-action@v2
+    - uses: gradle/gradle-build-action@v3
     - name: Check for missing qq strings
       run: ./scripts/missing-qq.py
     - name: Build, test, and lint

.github/workflows/android_smoke_test.yml

@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
-    - uses: gradle/gradle-build-action@v2
+    - uses: gradle/gradle-build-action@v3
 
     - name: Instrumentation Tests
       uses: reactivecircus/android-emulator-runner@v2
@@ -26,7 +26,7 @@ jobs:
 
     - name: Upload results
       if: ${{ always() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: instrumentation-test-results ${{ matrix.api-level }}
         path: ./**/build/reports/androidTests/connected/**

app/build.gradle

@@ -37,7 +37,7 @@ android {
         applicationId 'org.wikipedia'
         minSdk 21
         targetSdk 34
-        versionCode 50466
+        versionCode 50475
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -168,18 +168,18 @@ dependencies {
     // use http://gradleplease.appspot.com/ or http://search.maven.org/.
     // Debug with ./gradlew -q app:dependencies --configuration compile
 
-    String okHttpVersion = '4.10.0'
+    String okHttpVersion = '4.12.0'
     String retrofitVersion = '2.9.0'
-    String glideVersion = '4.15.1'
+    String glideVersion = '4.16.0'
     String mockitoVersion = '5.2.0'
-    String leakCanaryVersion = '2.12'
+    String leakCanaryVersion = '2.13'
     String kotlinCoroutinesVersion = '1.7.3'
-    String firebaseMessagingVersion = '23.4.0'
-    String mlKitVersion = '17.0.4'
+    String firebaseMessagingVersion = '23.4.1'
+    String mlKitVersion = '17.0.5'
     String roomVersion = "2.6.1"
     String espressoVersion = '3.5.1'
-    String serialization_version = '1.5.1'
-    String metricsVersion = '2.0'
+    String serialization_version = '1.6.2'
+    String metricsVersion = '2.4'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
@@ -213,17 +213,21 @@ dependencies {
     implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
     ksp "com.github.bumptech.glide:ksp:$glideVersion"
 
+    implementation "com.squareup.okhttp3:okhttp-tls:$okHttpVersion"
     implementation "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
     implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
     implementation "com.squareup.retrofit2:adapter-rxjava3:$retrofitVersion"
     implementation "io.reactivex.rxjava3:rxjava:3.1.8"
     implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
     implementation 'org.apache.commons:commons-lang3:3.14.0'
-    implementation 'org.jsoup:jsoup:1.17.1'
+    implementation 'org.jsoup:jsoup:1.17.2'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation 'com.github.skydoves:balloon:1.6.3'
+    implementation 'com.github.skydoves:balloon:1.6.4'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
 
+    implementation 'org.maplibre.gl:android-sdk:10.2.0'
+    implementation 'org.maplibre.gl:android-plugin-annotation-v9:2.0.2'
+
     implementation("androidx.room:room-runtime:$roomVersion")
     annotationProcessor "androidx.room:room-compiler:$roomVersion"
     ksp "androidx.room:room-compiler:$roomVersion"
@@ -260,7 +264,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
     androidTestImplementation "androidx.test.espresso:espresso-web:$espressoVersion"
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0'
     androidTestImplementation "androidx.room:room-testing:$roomVersion"
     androidTestUtil 'androidx.test:orchestrator:1.4.2'
 }

app/src/androidTest/java/org/wikipedia/TestUtil.kt

@@ -5,9 +5,18 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.ColorInt
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.NoMatchingViewException
 import androidx.test.espresso.UiController
 import androidx.test.espresso.ViewAction
-import androidx.test.espresso.action.*
+import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.action.CoordinatesProvider
+import androidx.test.espresso.action.GeneralLocation
+import androidx.test.espresso.action.GeneralSwipeAction
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.action.Swipe
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
@@ -27,6 +36,15 @@ object TestUtil {
         return WithGrandparentMatcher(grandparentMatcher)
     }
 
+    fun ViewInteraction.isDisplayed(): Boolean {
+        return try {
+            check(matches(ViewMatchers.isDisplayed()))
+            true
+        } catch (e: NoMatchingViewException) {
+            false
+        }
+    }
+
     fun isNotVisible(): Matcher<View> {
         return IsNotVisibleMatcher()
     }