Skip to content

Commit c70e495

Browse files
authored
feat: update target SDK to API 35 and fix edge-to-edge compatibility (#1486)
1 parent 1791ff3 commit c70e495

38 files changed

+122
-60
lines changed

config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<preference name="AndroidLaunchMode" value="singleTask" />
3333
<preference name="prerendered-icon" value="false" />
3434
<preference name="androidxEnabled" value="true" />
35+
<preference name="android-targetSdkVersion" value="35" />
3536

3637

3738
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">

hooks/post-process.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function patchTargetSdkVersion() {
4949

5050
if (sdkRegex.test(content)) {
5151
const fdroid = fs.readFileSync(path.join(prefix,'fdroid.bool'), 'utf-8').trim();
52-
var api = "34"
52+
var api = "35"
5353
if(fdroid == "true"){
5454
api = "28"
5555
}

package-lock.json

Lines changed: 47 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
"cordova-plugin-websocket": {},
3838
"cordova-plugin-buildinfo": {},
3939
"cordova-plugin-system": {},
40-
"com.foxdebug.acode.rk.exec.terminal": {}
40+
"com.foxdebug.acode.rk.exec.terminal": {},
41+
"com.foxdebug.acode.rk.exec.proot": {}
4142
},
4243
"platforms": [
4344
"android"
@@ -63,8 +64,9 @@
6364
"@types/url-parse": "^1.4.11",
6465
"autoprefixer": "^10.4.19",
6566
"babel-loader": "^9.1.3",
67+
"com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot",
6668
"com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal",
67-
"cordova-android": "^13.0.0",
69+
"cordova-android": "^14.0.1",
6870
"cordova-clipboard": "^1.3.0",
6971
"cordova-plugin-advanced-http": "^3.3.1",
7072
"cordova-plugin-browser": "file:src/plugins/browser",

res/android/values/themes.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
66
<item name="windowSplashScreenAnimationDuration">200</item>
77
<item name="postSplashScreenTheme">@style/Theme.AppCompat.DayNight.NoActionBar</item>
8+
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
89
</style>
910
</resources>

src/lang/ar-ye.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,5 +420,6 @@
420420
"terminal:cursor style": "Cursor Style",
421421
"terminal:font family": "Font Family",
422422
"terminal:convert eol": "Convert EOL",
423-
"terminal": "Terminal"
423+
"terminal": "Terminal",
424+
"allFileAccess": "All file access"
424425
}

src/lang/be-by.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,5 +421,6 @@
421421
"terminal:cursor style": "Cursor Style",
422422
"terminal:font family": "Font Family",
423423
"terminal:convert eol": "Convert EOL",
424-
"terminal": "Terminal"
424+
"terminal": "Terminal",
425+
"allFileAccess": "All file access"
425426
}

src/lang/bn-bd.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,5 +420,6 @@
420420
"terminal:cursor style": "Cursor Style",
421421
"terminal:font family": "Font Family",
422422
"terminal:convert eol": "Convert EOL",
423-
"terminal": "Terminal"
423+
"terminal": "Terminal",
424+
"allFileAccess": "All file access"
424425
}

src/lang/cs-cz.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,5 +420,6 @@
420420
"terminal:cursor style": "Cursor Style",
421421
"terminal:font family": "Font Family",
422422
"terminal:convert eol": "Convert EOL",
423-
"terminal": "Terminal"
423+
"terminal": "Terminal",
424+
"allFileAccess": "All file access"
424425
}

src/lang/de-de.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,5 +420,6 @@
420420
"terminal:cursor style": "Cursor Style",
421421
"terminal:font family": "Font Family",
422422
"terminal:convert eol": "Convert EOL",
423-
"terminal": "Terminal"
423+
"terminal": "Terminal",
424+
"allFileAccess": "All file access"
424425
}

0 commit comments

Comments
 (0)