Merge branch 'main' of github.com:opendocument-app/OpenDocument.droid into add-password-protected-tests

TomTasche · TomTasche · commit 7a4ae233915f · 2025-08-03T16:06:25.000+02:00
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -9,7 +9,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  ndk_version: 26.3.11579264
+  ndk_version: 28.1.13356709
 
 jobs:
   build:
@@ -86,6 +86,7 @@ jobs:
           - { arch: x86_64, api-level: 29 }
           - { arch: x86_64, api-level: 30 }
           - { arch: x86_64, api-level: 32 }
+          - { arch: x86_64, api-level: 34 }
     steps:
     - name: checkout
       uses: actions/checkout@v4
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 android {
-    ndkVersion "26.3.11579264"
+    ndkVersion "28.1.13356709"
 }
 
 tasks.register('conanProfile', Copy) {
@@ -30,7 +30,7 @@ tasks.register('conanProfile', Copy) {
 android {
     defaultConfig {
         applicationId "at.tomtasche.reader"
-        minSdkVersion 34
+        minSdkVersion 23
         compileSdkVersion 34
         targetSdkVersion 34
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`android {`
`11`		`- ndkVersion "26.3.11579264"`
	`11`	`+ ndkVersion "28.1.13356709"`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`tasks.register('conanProfile', Copy) {`
`@@ -30,7 +30,7 @@ tasks.register('conanProfile', Copy) {`
`30`	`30`	`android {`
`31`	`31`	`defaultConfig {`
`32`	`32`	`applicationId "at.tomtasche.reader"`
`33`		`- minSdkVersion 34`
	`33`	`+ minSdkVersion 23`
`34`	`34`	`compileSdkVersion 34`
`35`	`35`	`targetSdkVersion 34`
`36`	`36`