Merge branch 'master' into 4.0.x

CB-12736 Updated version and RELEASENOTES.md for release 4.0.3 (via coho)
CB-12622 Added Android 6.0 build badge to README
2026-02-16 00:00:04 +08:00 · 2017-04-27 13:05:10 -07:00 · 2017-04-27 13:05:08 -07:00 · 2017-04-26 16:30:20 +03:00 · 2017-04-21 19:26:24 -07:00 · 2017-03-02 15:26:49 -08:00
6 changed files with 24 additions and 6 deletions
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ description: Control the splash screen for your app.
 #         under the License.
 -->

-|Android 4.4|Android 5.1|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
-|:-:|:-:|:-:|:-:|:-:|:-:|
-|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](https://travis-ci.org/apache/cordova-plugin-splashscreen.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-splashscreen)|
+|Android 4.4|Android 5.1|Android 6.0|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
+|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
+|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-6.0,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-6.0,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen/)|[![Build Status](https://travis-ci.org/apache/cordova-plugin-splashscreen.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-splashscreen)|

 # cordova-plugin-splashscreen

--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,10 @@
 -->
 # Release Notes

+### 4.0.3 (Apr 27, 2017)
+* [CB-12622](https://issues.apache.org/jira/browse/CB-12622) Added **Android 6.0** build badge to `README`
+* [CB-12685](https://issues.apache.org/jira/browse/CB-12685) added `package.json` to tests folder
+
 ### 4.0.2 (Feb 28, 2017)
 * [CB-12353](https://issues.apache.org/jira/browse/CB-12353) Corrected merges usage in `plugin.xml`
 * [CB-12369](https://issues.apache.org/jira/browse/CB-12369) Add plugin typings from `DefinitelyTyped` 
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cordova-plugin-splashscreen",
-  "version": "4.0.2",
+  "version": "4.0.3",
  "description": "Cordova Splashscreen Plugin",
  "types": "./types/index.d.ts",
  "cordova": {
--- a/plugin.xml
+++ b/plugin.xml
@@ -20,7 +20,7 @@

 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
           id="cordova-plugin-splashscreen"
-      version="4.0.2">
+      version="4.0.3">
    <name>Splashscreen</name>
    <description>Cordova Splashscreen Plugin</description>
    <license>Apache 2.0</license>
--- a/tests/package.json
+++ b/tests/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "cordova-plugin-splashscreen-tests",
+  "version": "4.0.3-dev",
+  "description": "",
+  "cordova": {
+    "id": "cordova-plugin-splashscreen-tests",
+    "platforms": []
+  },
+  "keywords": [
+    "ecosystem:cordova"
+  ],
+  "author": "",
+  "license": "Apache 2.0"
+}
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -20,7 +20,7 @@

 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
    id="cordova-plugin-splashscreen-tests"
-    version="4.0.2">
+    version="4.0.3">
    <name>Cordova Splashscreen Plugin Tests</name>
    <license>Apache 2.0</license>
Author	SHA1	Message	Date
filmaj	3bd0f289d7	Merge branch 'master' into 4.0.x	2017-04-27 13:05:10 -07:00
filmaj	85aa605a12	CB-12736 Updated version and RELEASENOTES.md for release 4.0.3 (via coho)	2017-04-27 13:05:08 -07:00
Alexander Sorokin	7c687957f8	CB-12622 Added Android 6.0 build badge to README	2017-04-26 16:30:20 +03:00
Steve Gill	13849c3d20	CB-12685: added package.json to tests folder	2017-04-21 19:26:24 -07:00
Steve Gill	90ba3dfc5b	Set VERSION to 4.0.3-dev (via coho)	2017-03-02 15:26:49 -08:00
Steve Gill	b1ceb532f8	CB-12519 Updated version and RELEASENOTES.md for release 4.0.2	2017-02-28 17:41:27 -08:00
daserge	1185561549	CB-12353 Corrected merges usage in plugin.xml	2017-01-20 14:57:35 +03:00
Nikita Matrosov	894d164191	CB-12369: Add plugin typings from DefinitelyTyped This closes #123	2017-01-20 11:56:43 +03:00
Alexander Sorokin	caa5534c0d	CB-12363 Added build badges for iOS 9.3 and 10.0	2017-01-18 13:38:07 +03:00
Shazron Abdullah	a922ce0453	CB-12236 - Fixed RELEASENOTES for cordova-plugin-splashscreen	2016-12-11 12:58:03 -08:00
Alexander Sorokin	6195d6741b	CB-12230 Removed Windows 8.1 build badges	2016-12-09 13:58:36 +03:00
Shazron Abdullah	0f2a069588	CB-12224 Incremented plugin version.	2016-12-07 16:55:08 -08:00