Merge branch 'main' into On-this-day-refactor

Author: Isira-Seneviratne

.github/workflows/android.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'
@@ -48,7 +48,7 @@ jobs:
     - name: Sleep for 30 seconds, to allow the tag to be deleted
       run: sleep 30s
       shell: bash
-    - uses: ncipollo/release-action@v1.18.0
+    - uses: ncipollo/release-action@v1.20.0
       name: Create new tag and release and upload artifacts
       with:
         name: latest

.github/workflows/android_branch.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'

.github/workflows/android_offline_test.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'

.github/workflows/android_pr.yml

@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: gradle/actions/wrapper-validation@v4
-    - uses: actions/setup-java@v4
+    - uses: gradle/actions/wrapper-validation@v5
+    - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'

.github/workflows/android_smoke_test.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'

app/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.application'
     id 'com.google.devtools.ksp'
@@ -18,27 +20,27 @@ static def computeVersionName(versionCode, label) {
     return "2.7.${versionCode}-${label}-${(new Date()).format('yyyy-MM-dd')}"
 }
 
-final JavaVersion JAVA_VERSION = JavaVersion.VERSION_17
-
 android {
-    compileSdk 35
+    compileSdk = 36
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
+        coreLibraryDesugaringEnabled = true
 
-        sourceCompatibility = JAVA_VERSION
-        targetCompatibility = JAVA_VERSION
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JAVA_VERSION
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     defaultConfig {
         applicationId 'org.wikipedia'
-        minSdk 21
-        targetSdk 35
-        versionCode 50544
+        minSdk = 23
+        targetSdk = 36
+        versionCode 50555
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -205,6 +207,7 @@ dependencies {
     implementation libs.photoview
     implementation libs.balloon
     implementation libs.retrofit2.kotlinx.serialization.converter
+    implementation(libs.paging.compose)
 
     implementation libs.android.sdk
     implementation libs.android.plugin.annotation.v9

app/src/androidTest/java/org/wikipedia/base/BaseTest.kt

@@ -38,7 +38,8 @@ data class DataInjector(
     val intentBuilder: (Intent.() -> Unit)? = null,
     val showOneTimeCustomizeToolbarTooltip: Boolean = false,
     val readingListShareTooltipShown: Boolean = true,
-    val otdEntryDialogShown: Boolean = true
+    val otdEntryDialogShown: Boolean = true,
+    val enableYearInReview: Boolean = false,
 )
 
 abstract class BaseTest<T : AppCompatActivity>(
@@ -70,6 +71,7 @@ abstract class BaseTest<T : AppCompatActivity>(
         Prefs.showOneTimeCustomizeToolbarTooltip = dataInjector.showOneTimeCustomizeToolbarTooltip
         Prefs.readingListShareTooltipShown = dataInjector.readingListShareTooltipShown
         Prefs.otdEntryDialogShown = dataInjector.otdEntryDialogShown
+        Prefs.isYearInReviewEnabled = dataInjector.enableYearInReview
         dataInjector.overrideEditsContribution?.let {
             Prefs.overrideSuggestedEditContribution = it
         }

app/src/androidTest/java/org/wikipedia/base/actions/ListActions.kt

@@ -206,6 +206,23 @@ class ListActions {
             )
     }
 
+    fun verifyItemExistWithText(
+        recyclerViewId: Int,
+        text: String
+    ) {
+        onView(withId(recyclerViewId))
+            .check(
+                matches(
+                    hasDescendant(
+                        allOf(
+                            withText(text),
+                            isDisplayed()
+                        )
+                    )
+                )
+            )
+    }
+
     private fun verifyItemAtPosition(
         recyclerViewId: Int,
         position: Int,

app/src/androidTest/java/org/wikipedia/database/AppDatabaseTests.kt

@@ -5,10 +5,15 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.count
-import kotlinx.coroutines.flow.first
-import org.hamcrest.CoreMatchers.*
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.CoreMatchers.notNullValue
+import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.After
 import org.junit.Before
@@ -22,7 +27,7 @@ import org.wikipedia.search.db.RecentSearchDao
 import org.wikipedia.talk.db.TalkPageSeen
 import org.wikipedia.talk.db.TalkPageSeenDao
 import org.wikipedia.util.log.L
-import java.util.*
+import java.util.Date
 
 @RunWith(AndroidJUnit4::class)
 class AppDatabaseTests {
@@ -100,8 +105,8 @@ class AppDatabaseTests {
 
         notificationDao.insertNotifications(notifications)
 
-        var enWikiList = notificationDao.getNotificationsByWiki(listOf("enwiki")).first()
-        val zhWikiList = notificationDao.getNotificationsByWiki(listOf("zhwiki")).first()
+        var enWikiList = notificationDao.getNotificationsByWiki(listOf("enwiki"))
+        val zhWikiList = notificationDao.getNotificationsByWiki(listOf("zhwiki"))
         assertThat(enWikiList, notNullValue())
         assertThat(enWikiList.first().id, equalTo(123759827))
         assertThat(zhWikiList.first().id, equalTo(2470933))
@@ -114,18 +119,18 @@ class AppDatabaseTests {
         notificationDao.updateNotification(firstEnNotification)
 
         // get updated item
-        enWikiList = notificationDao.getNotificationsByWiki(listOf("enwiki")).first()
+        enWikiList = notificationDao.getNotificationsByWiki(listOf("enwiki"))
         assertThat(enWikiList.first().id, equalTo(123759827))
         assertThat(enWikiList.first().isUnread, equalTo(true))
 
         notificationDao.deleteNotification(firstEnNotification)
         assertThat(notificationDao.getAllNotifications().size, equalTo(2))
-        assertThat(notificationDao.getNotificationsByWiki(listOf("enwiki")).first().size, equalTo(1))
+        assertThat(notificationDao.getNotificationsByWiki(listOf("enwiki")).size, equalTo(1))
 
-        notificationDao.deleteNotification(notificationDao.getNotificationsByWiki(listOf("enwiki")).first().first())
-        assertThat(notificationDao.getNotificationsByWiki(listOf("enwiki")).first().isEmpty(), equalTo(true))
+        notificationDao.deleteNotification(notificationDao.getNotificationsByWiki(listOf("enwiki")).first())
+        assertThat(notificationDao.getNotificationsByWiki(listOf("enwiki")).isEmpty(), equalTo(true))
 
-        notificationDao.deleteNotification(notificationDao.getNotificationsByWiki(listOf("zhwiki")).first().first())
+        notificationDao.deleteNotification(notificationDao.getNotificationsByWiki(listOf("zhwiki")).first())
         assertThat(notificationDao.getAllNotifications().isEmpty(), equalTo(true))
     }
 }

app/src/androidTest/java/org/wikipedia/database/UpgradeFromPreRoomTest.kt

@@ -4,7 +4,6 @@ import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.nullValue
@@ -123,7 +122,7 @@ class UpgradeFromPreRoomTest(private val fromVersion: Int) {
         val historyEntry = historyDao.findEntryBy("ru.wikipedia.org", "ru", "Обама,_Барак")!!
         assertThat(historyEntry.displayTitle, equalTo("Обама, Барак"))
 
-        val talkPageSeen = talkPageSeenDao.getAll().first()
+        val talkPageSeen = talkPageSeenDao.getAll()
         if (fromVersion == 22) {
             assertThat(talkPageSeen.count(), equalTo(2))
             assertThat(offlineObjectDao.getOfflineObject("https://en.wikipedia.org/api/rest_v1/page/summary/Joe_Biden")!!.path, equalTo("/data/user/0/org.wikipedia.dev/files/offline_files/481b1ef996728fd9994bd97ab19733d8"))