Skip to content
This repository has been archived by the owner on Oct 6, 2021. It is now read-only.

Commit

Permalink
Upgrade cordova platforms
Browse files Browse the repository at this point in the history
Also up the Android minSdkVersion to 21 (Android 5.0).
  • Loading branch information
pascalw committed Feb 2, 2018
1 parent 0364f35 commit 25ccd97
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Changed
- Nightwatch tests now run headless by default. [#200](https://github.com/kabisa/maji/pull/200)
- Upgraded Cordova platforms. [#217](https://github.com/kabisa/maji/pull/217)

## 3.1.1

Expand Down
8 changes: 4 additions & 4 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

## Browser support

Maji will work in evergreen browsers, IE10+, Android 4.4+ and iOS 8+. Minimal horizontal resolution is 320px.
Maji will work in evergreen browsers, IE10+, Android 5.0+ and iOS 8+. Minimal horizontal resolution is 320px.

Minimal support can be determined by which technologies Maji uses, and which front-end technologies you decide to use:

Expand All @@ -69,19 +69,19 @@ Preact:
Flexbox:

* IE10+
* Android 4.4+ (2.1 - 4.3 if you don't use `flex-wrap`)
* Android 5.0+ (2.1 - 4.3 if you don't use `flex-wrap`)
* iOS 7.1+ (3.2 - 6.1 if you don't use `flex-wrap`)

CSS calc:

* IE9+
* iOS 6.1+
* Android 4.4+
* Android 5.0+

SVG:

* IE9+
* Android 4.4+ (3+ if you don't use masking)
* Android 5.0+ (3+ if you don't use masking)
* iOS 3.2+

## Components you might not need
Expand Down
8 changes: 4 additions & 4 deletions project_template/cordova/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

<hook type="before_platform_add" src="../node_modules/maji/cordova/hooks/before_platform_add.js" />

<engine name="android" spec="~6.2.3" />
<engine name="ios" spec="~4.4.0" />
<engine name="android" spec="^7.0.0" />
<engine name="ios" spec="^4.5.4" />

<preference name="DisallowOverscroll" value="true"/>
<preference name="Orientation" value="portrait" />
Expand All @@ -21,8 +21,8 @@
<preference name="SplashScreenDelay" value="0" />

<!-- target Android SDK versions //-->
<preference name="android-minSdkVersion" value="14" />
<preference name="android-targetSdkVersion" value="19" />
<preference name="android-minSdkVersion" value="21" />
<preference name="android-targetSdkVersion" value="24" />

<!-- disable icloud storage sync -->
<preference name="BackupWebStorage" value="local"/>
Expand Down
4 changes: 2 additions & 2 deletions project_template/cordova/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
}
},
"dependencies": {
"cordova-android": "~6.2.3",
"cordova-ios": "~4.4.0",
"cordova-android": "^7.0.0",
"cordova-ios": "^4.5.4",
"cordova-plugin-networkactivityindicator": "~0.1.1",
"cordova-plugin-splashscreen": "~4.0.0",
"cordova-plugin-whitelist": "~1.3.0"
Expand Down

0 comments on commit 25ccd97

Please sign in to comment.