Merge remote-tracking branch 'origin/master'

BobbyESP · Nov 29, 2024 · ed299b8 · ed299b8
2 parents 75a59eb + b7634d1
commit ed299b8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
@@ -4,7 +4,8 @@ name: Android CI
 on:
   pull_request:
     branches: [ "master" ]
-
+  workflow_dispatch:
+
 jobs:
   build-debug:
     name: Build FOSS APKs
@@ -55,4 +56,4 @@ jobs:
         with:
             name: release-artifacts
             paths: |
-              app/build/outputs/apk/release/
+              app/build/outputs/apk/release/
diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale = en-US
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ lifecycle-runtime-ktx = "2.8.7"
 activity-compose = "1.9.3"
 ksp = "2.0.21-1.0.28"
 splashscreen = "1.0.1"
-media3 = "1.4.1"
+media3 = "1.5.0"
 leakcanary = "2.13"
 
 #Compose