[pull] main from wikimedia:main

.github/CODEOWNERS

@@ -3,4 +3,4 @@
 
 # For more information: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-*           @cooltey @dbrant @sharvaniharan
+*           @cooltey @dbrant @Williamrai @voyagerfan

.github/dependabot.yml

@@ -0,0 +1,25 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    registries: "*"
+    labels: [ "dependencies" ]
+    groups:
+      kotlin-ksp:
+        patterns:
+          - "org.jetbrains.kotlin:*"
+          - "org.jetbrains.kotlin.jvm"
+          - "com.google.devtools.ksp"
+    open-pull-requests-limit: 20
+registries:
+  maven-google:
+    type: "maven-repository"
+    url: "https://maven.google.com"
+    replaces-base: true

.github/pull_request_template.md

@@ -0,0 +1,8 @@
+### What does this do?
+
+
+### Why is this needed?
+
+
+**Phabricator:**
+https://phabricator.wikimedia.org/T...

.github/workflows/android.yml

@@ -22,7 +22,7 @@ jobs:
       run: ./gradlew clean checkstyle ktlint assembleAlphaRelease lintAlphaRelease testAlphaRelease
     - name: List
       run: ls -alR ./app/build/outputs/apk/
-    - uses: r0adkll/sign-android-release@v1
+    - uses: kevin-david/zipalign-sign-android-release@v2
       name: Sign APK
       id: build_signed
       with:
@@ -32,13 +32,13 @@ jobs:
         keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
         keyPassword: ${{ secrets.KEY_PASSWORD }}
       env:
-        # override default build-tools version (29.0.3) -- optional
-        BUILD_TOOLS_VERSION: "34.0.0"
+        # override default build-tools (optional)
+        BUILD_TOOLS_VERSION: "35.0.0"
     - name: Create hash
       run: git rev-parse HEAD > app/build/outputs/apk/alpha/release/rev-hash.txt
     - name: Rename APK to universal
       run: mv app/build/outputs/apk/alpha/release/app-alpha-release-signed.apk app/build/outputs/apk/alpha/release/app-alpha-universal-release.apk
-    - uses: dev-drprasad/delete-tag-and-release@v0.2.1
+    - uses: dev-drprasad/delete-tag-and-release@v1.1
       name: Delete latest alpha tag and release
       with:
         tag_name: latest
@@ -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.13.0
+    - uses: ncipollo/release-action@v1.16.0
       name: Create new tag and release and upload artifacts
       with:
         name: latest

.github/workflows/android_branch.yml

@@ -21,7 +21,7 @@ jobs:
       run: ./gradlew clean assembleAlphaRelease
     - name: List
       run: ls -alR ./app/build/outputs/apk/
-    - uses: r0adkll/sign-android-release@v1
+    - uses: kevin-david/zipalign-sign-android-release@v2
       name: Sign APK
       id: build_signed
       with:
@@ -31,8 +31,8 @@ jobs:
         keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
         keyPassword: ${{ secrets.KEY_PASSWORD }}
       env:
-        # override default build-tools version (29.0.3) -- optional
-        BUILD_TOOLS_VERSION: "34.0.0"
+        # override default build-tools version (optional)
+        BUILD_TOOLS_VERSION: "35.0.0"
     - uses: actions/upload-artifact@v4
       name: Upload APK artifact
       with:

.github/workflows/android_phab.yml

@@ -21,4 +21,5 @@ jobs:
               -d transactions[0][type]=comment \
               -d transactions[0][value]="${message}" \
               -d objectIdentifier=${line}
+          sleep 10
         done

.github/workflows/android_pr.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: gradle/wrapper-validation-action@v2
+    - uses: gradle/actions/wrapper-validation@v4
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'

.gitignore

@@ -39,3 +39,8 @@ scripts/backup.ab
 # miscellaneous
 all-apks.sh
 device*.png
+*.salive
+*keystore*
+
+# Log Files
+*.log

.mailmap

@@ -0,0 +1,5 @@
+# See: https://git-scm.com/docs/git-shortlog#_mapping_authors
+#
+Brooke Vibber <[email protected]>
+Brooke Vibber <[email protected]> <[email protected]>
+Brooke Vibber <[email protected]> <[email protected]>

app/build.gradle

@@ -5,6 +5,7 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-parcelize'
     id 'kotlinx-serialization'
+    alias(libs.plugins.compose.compiler)
 }
 
 // Copy the signing.properties.sample file to ~/.sign/signing.properties and adjust the values.
@@ -20,7 +21,7 @@ static def computeVersionName(versionCode, label) {
 final JavaVersion JAVA_VERSION = JavaVersion.VERSION_17
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     compileOptions {
         coreLibraryDesugaringEnabled true
@@ -36,8 +37,8 @@ android {
     defaultConfig {
         applicationId 'org.wikipedia'
         minSdk 21
-        targetSdk 34
-        versionCode 50479
+        targetSdk 35
+        versionCode 50529
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -63,6 +64,7 @@ android {
     buildFeatures {
         viewBinding true
         buildConfig true
+        compose true
     }
 
     androidResources {
@@ -71,11 +73,10 @@ android {
 
     sourceSets {
 
-        prod { java.srcDirs += 'src/extra/java' }
-        beta { java.srcDirs += 'src/extra/java' }
-        alpha { java.srcDirs += 'src/extra/java' }
-        dev { java.srcDirs += 'src/extra/java' }
-        custom { java.srcDirs += 'src/extra/java' }
+        [ prod, beta, alpha, dev, custom ].forEach {
+            it.java.srcDirs += 'src/extra/java'
+            it.res.srcDirs += 'src/extra/res'
+        }
 
         androidTest {
             assets.srcDirs += files("$projectDir/schemas".toString())
@@ -172,105 +173,114 @@ dependencies {
     // use http://gradleplease.appspot.com/ or http://search.maven.org/.
     // Debug with ./gradlew -q app:dependencies --configuration compile
 
-    String okHttpVersion = '4.12.0'
-    String retrofitVersion = '2.9.0'
-    String glideVersion = '4.16.0'
-    String mockitoVersion = '5.2.0'
-    String leakCanaryVersion = '2.13'
-    String kotlinCoroutinesVersion = '1.7.3'
-    String firebaseMessagingVersion = '23.4.1'
-    String mlKitVersion = '17.0.5'
-    String roomVersion = "2.6.1"
-    String espressoVersion = '3.5.1'
-    String serialization_version = '1.6.2'
-    String metricsVersion = '2.4'
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
-
-    implementation "com.google.android.material:material:1.11.0"
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation "androidx.core:core-ktx:1.12.0"
-    implementation "androidx.browser:browser:1.7.0"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.fragment:fragment-ktx:1.6.2"
-    implementation "androidx.paging:paging-runtime-ktx:3.2.1"
-    implementation "androidx.palette:palette-ktx:1.0.0"
-    implementation "androidx.preference:preference-ktx:1.2.1"
-    implementation "androidx.recyclerview:recyclerview:1.3.2"
-    implementation "androidx.viewpager2:viewpager2:1.0.0"
-    implementation 'com.google.android.flexbox:flexbox:3.0.0'
-    implementation 'com.android.installreferrer:installreferrer:2.2'
-    implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
-    implementation 'androidx.work:work-runtime-ktx:2.9.0'
-    implementation "org.wikimedia.metrics:metrics-platform:$metricsVersion"
-
-    implementation ('com.github.michael-rapp:chrome-like-tab-switcher:0.4.6') {
-        exclude group: 'org.jetbrains'
-    }
-
-    implementation "com.github.bumptech.glide:glide:$glideVersion"
-    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.2'
-    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    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"
-    implementation("androidx.room:room-ktx:$roomVersion")
-    implementation "androidx.room:room-rxjava3:$roomVersion"
+    coreLibraryDesugaring libs.desugar.jdk.libs
+
+    implementation libs.kotlin.stdlib.jdk8
+    implementation libs.kotlinx.coroutines.core
+    implementation libs.kotlinx.coroutines.android
+    implementation libs.kotlinx.serialization.json
+
+    implementation libs.material
+    implementation libs.appcompat
+    implementation libs.core.ktx
+    implementation libs.browser
+    implementation libs.constraintlayout
+    implementation libs.fragment.ktx
+    implementation libs.paging.runtime.ktx
+    implementation libs.palette.ktx
+    implementation libs.preference.ktx
+    implementation libs.recyclerview
+    implementation libs.viewpager2
+    implementation libs.flexbox
+    implementation libs.drawerlayout
+    implementation libs.swiperefreshlayout
+    implementation libs.work.runtime.ktx
+    implementation libs.metrics.platform
+
+    implementation libs.glide
+    implementation libs.okhttp3.integration
+    ksp libs.glide.ksp
+
+    implementation libs.okhttp.tls
+    implementation libs.okhttp3.logging.interceptor
+    implementation libs.retrofit
+    implementation libs.commons.lang3
+    implementation libs.jsoup
+    implementation libs.photoview
+    implementation libs.balloon
+    implementation libs.retrofit2.kotlinx.serialization.converter
+
+    implementation libs.android.sdk
+    implementation libs.android.plugin.annotation.v9
+
+    implementation libs.androidx.room.runtime
+    annotationProcessor libs.androidx.room.compiler
+    ksp libs.androidx.room.compiler
+    implementation libs.androidx.room.ktx
 
     // For language detection during editing
-    prodImplementation "com.google.mlkit:language-id:$mlKitVersion"
-    betaImplementation "com.google.mlkit:language-id:$mlKitVersion"
-    alphaImplementation "com.google.mlkit:language-id:$mlKitVersion"
-    devImplementation "com.google.mlkit:language-id:$mlKitVersion"
-    customImplementation "com.google.mlkit:language-id:$mlKitVersion"
+    prodImplementation libs.com.google.mlkit.language.id
+    betaImplementation libs.com.google.mlkit.language.id
+    alphaImplementation libs.com.google.mlkit.language.id
+    devImplementation libs.com.google.mlkit.language.id
+    customImplementation libs.com.google.mlkit.language.id
 
     // For receiving push notifications for logged-in users.
-    prodImplementation "com.google.firebase:firebase-messaging-ktx:$firebaseMessagingVersion"
-    betaImplementation "com.google.firebase:firebase-messaging-ktx:$firebaseMessagingVersion"
-    alphaImplementation "com.google.firebase:firebase-messaging-ktx:$firebaseMessagingVersion"
-    devImplementation "com.google.firebase:firebase-messaging-ktx:$firebaseMessagingVersion"
-    customImplementation "com.google.firebase:firebase-messaging-ktx:$firebaseMessagingVersion"
-
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
-    implementation "com.squareup.leakcanary:plumber-android:$leakCanaryVersion"
-
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation "org.mockito:mockito-inline:$mockitoVersion"
-    testImplementation 'org.robolectric:robolectric:4.11.1'
-    testImplementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
-    testImplementation "com.squareup.okhttp3:mockwebserver:$okHttpVersion"
-    testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation "androidx.room:room-testing:$roomVersion"
-
-    androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
-    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.3.0'
-    androidTestImplementation "androidx.room:room-testing:$roomVersion"
-    androidTestUtil 'androidx.test:orchestrator:1.4.2'
+    prodImplementation libs.com.google.firebase.firebase.messaging.ktx3
+    betaImplementation libs.com.google.firebase.firebase.messaging.ktx3
+    alphaImplementation libs.com.google.firebase.firebase.messaging.ktx3
+    devImplementation libs.com.google.firebase.firebase.messaging.ktx3
+    customImplementation libs.com.google.firebase.firebase.messaging.ktx3
+
+    // For integrating with Google Pay for donations
+    prodImplementation libs.com.google.android.gms.play.services.wallet2
+    betaImplementation libs.com.google.android.gms.play.services.wallet2
+    alphaImplementation libs.com.google.android.gms.play.services.wallet2
+    devImplementation libs.com.google.android.gms.play.services.wallet2
+    customImplementation libs.com.google.android.gms.play.services.wallet2
+
+    // For InstallReferrer Library
+    prodImplementation libs.installreferrer
+    betaImplementation libs.installreferrer
+    alphaImplementation libs.installreferrer
+    devImplementation libs.installreferrer
+    customImplementation libs.installreferrer
+
+    debugImplementation libs.leakcanary.android
+    implementation libs.plumber.android
+
+    testImplementation libs.junit
+    testImplementation libs.mockito.inline
+    testImplementation libs.robolectric
+    testImplementation libs.okhttp3.okhttp
+    testImplementation libs.mockwebserver
+    testImplementation libs.hamcrest
+    testImplementation libs.room.testing
+
+    androidTestImplementation libs.espresso.core
+    androidTestImplementation libs.espresso.contrib
+    androidTestImplementation libs.androidx.espresso.intents
+    androidTestImplementation libs.espresso.web
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.uiautomator
+    androidTestImplementation libs.room.testing
+    androidTestUtil libs.androidx.orchestrator
+
+    // Compose Library
+    def composeBom = platform(libs.composeBom)
+    implementation(composeBom)
+    implementation(libs.compose.material3)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.ui.tooling.preview)
+    debugImplementation(libs.compose.ui.tooling)
+    implementation(libs.compose.activity)
+    implementation(libs.compose.view.model)
+
+    // Compose Test Library
+    androidTestImplementation(libs.compose.test)
+    androidTestImplementation(composeBom)
+    debugImplementation(libs.compose.debug.test)
+    debugImplementation(composeBom)
 }
 
 private setSigningConfigKey(config, Properties props) {

app/lint.xml

@@ -25,4 +25,5 @@
     <issue id="MissingQuantity" severity="warning" />
     <issue id="ImpliedQuantity" severity="warning" />
     <issue id="AppLinkUrlError" severity="warning" />
+    <issue id="UnsafeOptInUsageError" severity="ignore" />
 </lint>