Skip to content

Commit cb8b39f

Browse files
Merge branch 'main' into Serializable_extensions
# Conflicts: # app/src/main/java/org/wikipedia/watchlist/WatchlistExpiryDialog.kt
2 parents 6861b5e + 65bf40d commit cb8b39f

File tree

70 files changed

+3948
-978
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3948
-978
lines changed

.github/workflows/android.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
alias: ${{ secrets.KEY_STORE_ALIAS }}
3232
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
3333
keyPassword: ${{ secrets.KEY_PASSWORD }}
34+
env:
35+
# override default build-tools version (29.0.3) -- optional
36+
BUILD_TOOLS_VERSION: "34.0.0"
3437
- name: Create hash
3538
run: git rev-parse HEAD > app/build/outputs/apk/alpha/release/rev-hash.txt
3639
- name: Rename APK to universal

.github/workflows/android_branch.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
alias: ${{ secrets.KEY_STORE_ALIAS }}
3131
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
3232
keyPassword: ${{ secrets.KEY_PASSWORD }}
33+
env:
34+
# override default build-tools version (29.0.3) -- optional
35+
BUILD_TOOLS_VERSION: "34.0.0"
3336
- uses: actions/upload-artifact@v3
3437
name: Upload APK artifact
3538
with:

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
same "printed page" as the copyright notice for easier
188188
identification within third-party archives.
189189

190-
Copyright 2013-2023 Wikimedia Foundation et al.
190+
Copyright 2013-2024 Wikimedia Foundation et al.
191191

192192
Licensed under the Apache License, Version 2.0 (the "License");
193193
you may not use this file except in compliance with the License.

app/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737
applicationId 'org.wikipedia'
3838
minSdk 21
3939
targetSdk 34
40-
versionCode 50464
40+
versionCode 50466
4141
testApplicationId 'org.wikipedia.test'
4242
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4343
testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -150,6 +150,10 @@ android {
150150
namespace 'org.wikipedia'
151151
}
152152

153+
ksp {
154+
arg("room.schemaLocation", "$projectDir/schemas")
155+
}
156+
153157
configurations {
154158
compileClasspath.extendsFrom(implementation)
155159
}
@@ -170,7 +174,7 @@ dependencies {
170174
String mockitoVersion = '5.2.0'
171175
String leakCanaryVersion = '2.12'
172176
String kotlinCoroutinesVersion = '1.7.3'
173-
String firebaseMessagingVersion = '23.3.1'
177+
String firebaseMessagingVersion = '23.4.0'
174178
String mlKitVersion = '17.0.4'
175179
String roomVersion = "2.6.1"
176180
String espressoVersion = '3.5.1'
@@ -184,7 +188,7 @@ dependencies {
184188
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
185189
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
186190

187-
implementation "com.google.android.material:material:1.10.0"
191+
implementation "com.google.android.material:material:1.11.0"
188192
implementation 'androidx.appcompat:appcompat:1.6.1'
189193
implementation "androidx.core:core-ktx:1.12.0"
190194
implementation "androidx.browser:browser:1.7.0"

0 commit comments

Comments
 (0)