From b1ceb532f8a87dffcfc21903e7df64a252dde8c8 Mon Sep 17 00:00:00 2001
From: Steve Gill <stevengill97@gmail.com>
Date: Tue, 28 Feb 2017 17:41:27 -0800
Subject: [PATCH] CB-12519 Updated version and RELEASENOTES.md for release
 4.0.2

---
 RELEASENOTES.md  |  14 ++-
 package.json     |   2 +-
 plugin.xml       | 217 ++++++++++++++++++-----------------------------
 tests/plugin.xml |  33 ++-----
 4 files changed, 100 insertions(+), 166 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0056412..2a31446 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,10 +20,16 @@
 -->
 # Release Notes
 
+### 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` 
+* [CB-12363](https://issues.apache.org/jira/browse/CB-12363) Added build badges for **iOS 9.3** and **iOS 10.0** 
+* [CB-12230](https://issues.apache.org/jira/browse/CB-12230) Removed **Windows 8.1** build badges
+
 ### 4.0.1 (Dec 07, 2016)
 * [CB-12224](https://issues.apache.org/jira/browse/CB-12224) Updated version and RELEASENOTES.md for release 4.0.1
 * [CB-11751](https://issues.apache.org/jira/browse/CB-11751) 'extendedSplashScreen' is undefined Document that splashscreen needs to be disabled on Windows in case of updating entire document body
-* [CB-9287](https://issues.apache.org/jira/browse/CB-9287) Not enough Icons and Splashscreens for Windows 8.1 and Windows Phone 8.1
+* [CB-9287](https://issues.apache.org/jira/browse/CB-9287) Not enough Icons and Splashscreens for **Windows 8.1** and Windows Phone 8.1
 * [CB-11917](https://issues.apache.org/jira/browse/CB-11917) - Remove pull request template checklist item: "iCLA has been submitted…"
 * [CB-11830](https://issues.apache.org/jira/browse/CB-11830) (iOS) Fix doc typos in PR#114
 * [CB-11829](https://issues.apache.org/jira/browse/CB-11829) (iOS) Support for CB-9762; docs (CB-11830)
@@ -92,7 +98,7 @@
 * [CB-3562](https://issues.apache.org/jira/browse/CB-3562): Disable screen rotation for iPhone when splash screen is shown. (closes #47)
 * [CB-8988](https://issues.apache.org/jira/browse/CB-8988): Fix rotation on iOS/iPad (closes #46)
 * [CB-8904](https://issues.apache.org/jira/browse/CB-8904): Don't reset the static variable when it's destroyed, otherwise we might as well just have a member variable
-* Removed wp7 from plugin.xml and package.json
+* Removed wp7 from `plugin.xml` and package.json
 * [CB-8750](https://issues.apache.org/jira/browse/CB-8750) [wp8]: Rewrite resoultion helper
 * [CB-8750](https://issues.apache.org/jira/browse/CB-8750) [wp8]: Allow resolution-specific splashscreen images
 * [CB-8758](https://issues.apache.org/jira/browse/CB-8758) [wp8]: UnauthorizedAccessException on hide()
@@ -144,7 +150,7 @@
 
 ### 0.3.3 (Sep 17, 2014)
 * [CB-7249](https://issues.apache.org/jira/browse/CB-7249) cordova-plugin-splashscreen documentation translation
-* Renamed test dir, added nested plugin.xml
+* Renamed test dir, added nested `plugin.xml`
 * added documentation for manual tests
 * [CB-7196](https://issues.apache.org/jira/browse/CB-7196) port splashscreen tests to framework
 
@@ -190,7 +196,7 @@
 * [CB-5124](https://issues.apache.org/jira/browse/CB-5124) - Remove splashscreen config.xml values from iOS Configuration Docs, move to plugin docs
 
 ### 0.2.4 (Oct 28, 2013)
-* [CB-5128](https://issues.apache.org/jira/browse/CB-5128): add repo + issue tag to plugin.xml for splashscreen plugin
+* [CB-5128](https://issues.apache.org/jira/browse/CB-5128): add repo + issue tag to `plugin.xml` for splashscreen plugin
 * [CB-5010](https://issues.apache.org/jira/browse/CB-5010) Incremented plugin version on dev branch.
 
 ### 0.2.3 (Oct 9, 2013)
diff --git a/package.json b/package.json
index 943b53b..9e52c75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-splashscreen",
-  "version": "4.0.2-dev",
+  "version": "4.0.2",
   "description": "Cordova Splashscreen Plugin",
   "types": "./types/index.d.ts",
   "cordova": {
diff --git a/plugin.xml b/plugin.xml
index 1e968a8..77fd2d8 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,135 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-           id="cordova-plugin-splashscreen"
-      version="4.0.2-dev">
-    <name>Splashscreen</name>
-    <description>Cordova Splashscreen Plugin</description>
-    <license>Apache 2.0</license>
-    <keywords>cordova,splashscreen</keywords>
-    <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen.git</repo>
-    <issue>https://issues.apache.org/jira/browse/CB/component/12320653</issue>
-
-    <engines>
-        <engine name="cordova-android" version=">=3.6.0" /><!-- Requires CordovaPlugin.preferences -->
-        <engine name="cordova-windows" version=">=4.4.0" />
-    </engines>
-
-    <js-module src="www/splashscreen.js" name="SplashScreen">
-        <clobbers target="navigator.splashscreen" />
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-splashscreen" version="4.0.2">
+  <name>Splashscreen</name>
+  <description>Cordova Splashscreen Plugin</description>
+  <license>Apache 2.0</license>
+  <keywords>cordova,splashscreen</keywords>
+  <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen.git</repo>
+  <issue>https://issues.apache.org/jira/browse/CB/component/12320653</issue>
+  <engines>
+    <engine name="cordova-android" version=">=3.6.0"/>
+    <engine name="cordova-windows" version=">=4.4.0"/>
+  </engines>
+  <js-module src="www/splashscreen.js" name="SplashScreen">
+    <clobbers target="navigator.splashscreen"/>
+  </js-module>
+  <platform name="android">
+    <config-file target="res/xml/config.xml" parent="/*">
+      <feature name="SplashScreen">
+        <param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen"/>
+        <param name="onload" value="true"/>
+      </feature>
+    </config-file>
+    <source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen"/>
+  </platform>
+  <platform name="amazon-fireos">
+    <config-file target="res/xml/config.xml" parent="/*">
+      <feature name="SplashScreen">
+        <param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen"/>
+      </feature>
+    </config-file>
+    <source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen"/>
+  </platform>
+  <platform name="ubuntu">
+    <header-file src="src/ubuntu/splashscreen.h"/>
+    <source-file src="src/ubuntu/splashscreen.cpp"/>
+  </platform>
+  <platform name="ios">
+    <config-file target="config.xml" parent="/*">
+      <feature name="SplashScreen">
+        <param name="ios-package" value="CDVSplashScreen"/>
+        <param name="onload" value="true"/>
+      </feature>
+    </config-file>
+    <header-file src="src/ios/CDVSplashScreen.h"/>
+    <header-file src="src/ios/CDVViewController+SplashScreen.h"/>
+    <source-file src="src/ios/CDVSplashScreen.m"/>
+    <source-file src="src/ios/CDVViewController+SplashScreen.m"/>
+    <framework src="CoreGraphics.framework"/>
+  </platform>
+  <platform name="blackberry10">
+    <source-file src="src/blackberry10/index.js" target-dir="SplashScreen"/>
+    <config-file target="www/config.xml" parent="/widget">
+      <feature name="SplashScreen" value="SplashScreen"/>
+    </config-file>
+  </platform>
+  <platform name="wp8">
+    <config-file target="config.xml" parent="/*">
+      <feature name="SplashScreen">
+        <param name="wp-package" value="SplashScreen"/>
+        <param name="onload" value="true"/>
+      </feature>
+    </config-file>
+    <source-file src="src/wp/SplashScreen.cs"/>
+    <source-file src="src/wp/ResolutionHelper.cs"/>
+  </platform>
+  <platform name="windows8">
+    <js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
+      <runs/>
     </js-module>
-
-    <!-- android -->
-    <platform name="android">
-        <config-file target="res/xml/config.xml" parent="/*">
-            <feature name="SplashScreen">
-                <param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen"/>
-                <param name="onload" value="true"/>
-            </feature>
-        </config-file>
-
-        <source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen" />
-    </platform>
-
-    <!-- amazon-fireos -->
-    <platform name="amazon-fireos">
-        <config-file target="res/xml/config.xml" parent="/*">
-            <feature name="SplashScreen">
-            <param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen"/>
-            </feature>
-        </config-file>
-
-        <source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen" />
-    </platform>
-
-    <!-- ubuntu -->
-    <platform name="ubuntu">
-        <header-file src="src/ubuntu/splashscreen.h" />
-        <source-file src="src/ubuntu/splashscreen.cpp" />
-    </platform>
-
-    <!-- ios -->
-    <platform name="ios">
-        <config-file target="config.xml" parent="/*">
-		    <feature name="SplashScreen">
-			    <param name="ios-package" value="CDVSplashScreen"/>
-			    <param name="onload" value="true"/>
-		    </feature>
-        </config-file>
-
-        <header-file src="src/ios/CDVSplashScreen.h" />
-        <source-file src="src/ios/CDVSplashScreen.m" />
-        <header-file src="src/ios/CDVViewController+SplashScreen.h" />
-        <source-file src="src/ios/CDVViewController+SplashScreen.m" />
-
-	    <framework src="CoreGraphics.framework" />
-    </platform>
-
-    <!-- blackberry10 -->
-    <platform name="blackberry10">
-        <source-file src="src/blackberry10/index.js" target-dir="SplashScreen" />
-        <config-file target="www/config.xml" parent="/widget">
-            <feature name="SplashScreen" value="SplashScreen"/>
-        </config-file>
-    </platform>
-
-    <!-- wp8 -->
-    <platform name="wp8">
-        <config-file target="config.xml" parent="/*">
-            <feature name="SplashScreen">
-                <param name="wp-package" value="SplashScreen"/>
-                <param name="onload" value="true"/>
-            </feature>
-        </config-file>
-
-        <source-file src="src/wp/SplashScreen.cs" />
-        <source-file src="src/wp/ResolutionHelper.cs" />
-
-    </platform>
-
-    <!-- windows8 -->
-    <platform name="windows8">
-        <js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
-            <runs />
-        </js-module>
-    </platform>
-
-    <!-- windows -->
-    <platform name="windows">
-        <js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
-            <runs />
-        </js-module>
-    </platform>
-
-    <!-- tizen -->
-    <platform name="tizen">
-        <js-module src="src/tizen/SplashScreenProxy.js" name="SplashScreenProxy">
-            <runs />
-        </js-module>
-    </platform>
-
-    <!-- browser -->
-    <platform name="browser">
-        <js-module src="src/browser/SplashScreenProxy.js" name="SplashScreenProxy">
-            <runs />
-        </js-module>
-    </platform>
+  </platform>
+  <platform name="windows">
+    <js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
+      <runs/>
+    </js-module>
+  </platform>
+  <platform name="tizen">
+    <js-module src="src/tizen/SplashScreenProxy.js" name="SplashScreenProxy">
+      <runs/>
+    </js-module>
+  </platform>
+  <platform name="browser">
+    <js-module src="src/browser/SplashScreenProxy.js" name="SplashScreenProxy">
+      <runs/>
+    </js-module>
+  </platform>
 </plugin>
diff --git a/tests/plugin.xml b/tests/plugin.xml
index ae2f840..0288290 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -1,29 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-    id="cordova-plugin-splashscreen-tests"
-    version="4.0.2-dev">
-    <name>Cordova Splashscreen Plugin Tests</name>
-    <license>Apache 2.0</license>
-
-    <js-module src="tests.js" name="tests">
-    </js-module>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-splashscreen-tests" version="4.0.2">
+  <name>Cordova Splashscreen Plugin Tests</name>
+  <license>Apache 2.0</license>
+  <js-module src="tests.js" name="tests"/>
 </plugin>