Skip to content

Commit

Permalink
Merge pull request #119 from mendix/fix/android_sdk_33
Browse files Browse the repository at this point in the history
[MOO-1165] Android SDK updated to version 33.
  • Loading branch information
stelselim authored Oct 10, 2023
2 parents da94cc3 + b394abd commit 2313ad1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This project can be used to create a templated Phonegap Build package, as used w

### Prerequisites

- Recent `Node.js`.
- Recent `Node.js`. This code was tested with version 18. You can check by running `node -v`.
- Windows: install from [nodejs.org](https://nodejs.org/en/download/)
- MacOS: use [Brew](https://brew.sh/) to install `Node.js`: `brew install node`
- Linux, BSD, etc: install using the available package manager, e.g. on Debian: `sudo apt-get install node`
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mendix/mendix-hybrid-app-base",
"version": "6.0.3",
"version": "7.0.0",
"description": "Mendix PhoneGap Build base package",
"scripts": {
"appbase": "node ./node_modules/webpack/bin/webpack --config ./webpack.config.appbase.js",
Expand Down
18 changes: 9 additions & 9 deletions src/config.xml.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<description>{{description}}</description>
<content src="index.html" />

<engine name="android" spec="11.0.0" />
<engine name="android" spec="12.0.1" />
<engine name="ios" spec="5.1.1" />

<!-- allow assets to be loaded and open links in the app itself, see: http://phonegap.com/blog/2012/03/20/access-tags/ -->
Expand All @@ -30,7 +30,7 @@
<plugin name="cordova-plugin-device-motion" source="npm" spec="2.0.1" />
<plugin name="cordova-plugin-device-orientation" source="npm" spec="2.0.1" />
<plugin name="cordova-plugin-dialogs" source="npm" spec="2.0.1" />
<plugin name="cordova-plugin-file" source="npm" spec="7.0.0" />
<plugin name="cordova-plugin-file" source="npm" spec="8.0.0" />
<plugin name="cordova-plugin-file-opener2" source="npm" spec="4.0.0" />
<plugin name="cordova-plugin-ns0m-file-transfer" source="npm" spec="2.0.0-7" />
<plugin name="cordova-plugin-globalization" source="npm" spec="1.11.0" />
Expand All @@ -53,7 +53,7 @@

{{#permissions.camera}}
{{#permissions.photoLibrary}}
<plugin name="cordova-plugin-camera" source="npm" spec="6.0.0" />
<plugin name="cordova-plugin-camera" source="npm" spec="7.0.0" />
{{/permissions.photoLibrary}}
{{/permissions.camera}}

Expand All @@ -64,7 +64,7 @@
{{#permissions.camera}}
{{#permissions.photoLibrary}}
{{#permissions.microphone}}
<plugin name="cordova-plugin-media-capture" source="npm" spec="4.0.0" />
<plugin name="cordova-plugin-media-capture" source="npm" spec="5.0.0" />
{{/permissions.microphone}}
{{/permissions.photoLibrary}}
{{/permissions.camera}}
Expand All @@ -78,7 +78,7 @@
{{/permissions.geoLocation}}

{{#permissions.microphone}}
<plugin name="cordova-plugin-media" source="npm" spec="6.1.0" />
<plugin name="cordova-plugin-media" source="npm" spec="7.0.0" />
{{/permissions.microphone}}

{{#permissions.push}}
Expand All @@ -103,7 +103,7 @@
<!-- Disable backup to iCloud on iOS. -->
<preference name="BackupWebStorage" value="none" />

<plugin name="@mendix/cordova-plugin-wkwebview-engine" source="npm" spec="1.0.3-mx.1.3.0" />
<plugin name="@mendix/cordova-plugin-wkwebview-engine" source="npm" spec="1.0.3-mx.1.4.0" />

<preference name="WKWebViewOnly" value="true" />

Expand Down Expand Up @@ -169,14 +169,14 @@

<plugin name="cordova-plugin-android-permissions" source="npm" version="0.11.0" />

<preference name="android-minSdkVersion" value="21" />
<preference name="android-minSdkVersion" value="24" />

{{^crosswalkEnabled}}
<preference name="android-targetSdkVersion" value="32" />
<preference name="android-targetSdkVersion" value="33" />
{{/crosswalkEnabled}}

{{#crosswalkEnabled}}
<preference name="android-targetSdkVersion" value="23" />
<preference name="android-targetSdkVersion" value="24" />

<preference name="CrosswalkAnimatable" value="true" />
<preference name="xwalkMultipleApk" value="true" />
Expand Down

0 comments on commit 2313ad1

Please sign in to comment.