From 0f2a06958873f134ee886fd7d004af9ed5479f8e Mon Sep 17 00:00:00 2001
From: Shazron Abdullah <shazron@apache.org>
Date: Wed, 7 Dec 2016 16:55:08 -0800
Subject: [PATCH 01/11] CB-12224 Incremented plugin version.
---
package.json | 2 +-
plugin.xml | 2 +-
tests/plugin.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 949caca..9df051f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-splashscreen",
- "version": "4.0.1",
+ "version": "4.0.2-dev",
"description": "Cordova Splashscreen Plugin",
"cordova": {
"id": "cordova-plugin-splashscreen",
diff --git a/plugin.xml b/plugin.xml
index 483abbb..81b218d 100644
--- 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.1">
+ version="4.0.2-dev">
<name>Splashscreen</name>
<description>Cordova Splashscreen Plugin</description>
<license>Apache 2.0</license>
diff --git a/tests/plugin.xml b/tests/plugin.xml
index fd900f2..ae2f840 100644
--- 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.1">
+ version="4.0.2-dev">
<name>Cordova Splashscreen Plugin Tests</name>
<license>Apache 2.0</license>
From 6195d6741b5a09167a933fdbd83f9cd93426fb16 Mon Sep 17 00:00:00 2001
From: Alexander Sorokin <alexander.sorokin@akvelon.com>
Date: Fri, 9 Dec 2016 13:43:39 +0300
Subject: [PATCH 02/11] CB-12230 Removed Windows 8.1 build badges
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index aa2aa64..18302d9 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ description: Control the splash screen for your app.
# under the License.
-->
-|Android|iOS| Windows 8.1 Store | Windows 8.1 Phone | Windows 10 Store | Travis CI |
-|:-:|:-:|:-:|:-:|:-:|:-:|
-|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-8.1-store,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-8.1-phone,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen/)|[](https://travis-ci.org/apache/cordova-plugin-splashscreen)|
+|Android 4.4|Android 5.1|iOS|Windows 10 Store|Travis CI|
+|:-:|:-:|:-:|:-:|:-:|
+|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen/)|[](https://travis-ci.org/apache/cordova-plugin-splashscreen)|
# cordova-plugin-splashscreen
From a922ce0453a00268e7d3f1e47be54ffd6645a0ac Mon Sep 17 00:00:00 2001
From: Shazron Abdullah <shazron@apache.org>
Date: Sun, 11 Dec 2016 12:58:03 -0800
Subject: [PATCH 03/11] CB-12236 - Fixed RELEASENOTES for
cordova-plugin-splashscreen
---
RELEASENOTES.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 29a116a..0056412 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,6 +21,7 @@
# Release Notes
### 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-11917](https://issues.apache.org/jira/browse/CB-11917) - Remove pull request template checklist item: "iCLA has been submitted…"
From caa5534c0d18e1c0dec1dc08ad69543ec8fbcb8a Mon Sep 17 00:00:00 2001
From: Alexander Sorokin <alexander.sorokin@akvelon.com>
Date: Wed, 18 Jan 2017 13:38:07 +0300
Subject: [PATCH 04/11] CB-12363 Added build badges for iOS 9.3 and 10.0
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 18302d9..c317ae5 100644
--- 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|Windows 10 Store|Travis CI|
-|:-:|:-:|:-:|:-:|:-:|
-|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen/)|[](https://travis-ci.org/apache/cordova-plugin-splashscreen)|
+|Android 4.4|Android 5.1|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
+|:-:|:-:|:-:|:-:|:-:|:-:|
+|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen/)|[](https://travis-ci.org/apache/cordova-plugin-splashscreen)|
# cordova-plugin-splashscreen
From 894d1641915c4dead6656dc4e874a0b6b014addf Mon Sep 17 00:00:00 2001
From: Nikita Matrosov <v-nimatr@microsoft.com>
Date: Thu, 19 Jan 2017 16:11:15 +0300
Subject: [PATCH 05/11] CB-12369: Add plugin typings from DefinitelyTyped
This closes #123
---
package.json | 1 +
types/index.d.ts | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 types/index.d.ts
diff --git a/package.json b/package.json
index 9df051f..943b53b 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
"name": "cordova-plugin-splashscreen",
"version": "4.0.2-dev",
"description": "Cordova Splashscreen Plugin",
+ "types": "./types/index.d.ts",
"cordova": {
"id": "cordova-plugin-splashscreen",
"platforms": [
diff --git a/types/index.d.ts b/types/index.d.ts
new file mode 100644
index 0000000..968b340
--- /dev/null
+++ b/types/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for Apache Cordova Splashscreen plugin
+// Project: https://github.com/apache/cordova-plugin-splashscreen
+// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+//
+// Copyright (c) Microsoft Open Technologies Inc
+// Licensed under the MIT license.
+
+interface Navigator {
+ /** This plugin displays and hides a splash screen during application launch. */
+ splashscreen: {
+ /** Dismiss the splash screen. */
+ hide(): void;
+ /** Displays the splash screen. */
+ show(): void;
+ }
+}
\ No newline at end of file
From 1185561549eb7e3780a9d43a1795662692843444 Mon Sep 17 00:00:00 2001
From: daserge <v-seshak@microsoft.com>
Date: Wed, 18 Jan 2017 17:20:23 +0300
Subject: [PATCH 06/11] CB-12353 Corrected merges usage in plugin.xml
---
plugin.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugin.xml b/plugin.xml
index 81b218d..1e968a8 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -108,14 +108,14 @@
<!-- windows8 -->
<platform name="windows8">
<js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
- <merges target="" />
+ <runs />
</js-module>
</platform>
<!-- windows -->
<platform name="windows">
<js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
- <merges target="" />
+ <runs />
</js-module>
</platform>
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 07/11] 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>
From 90ba3dfc5b614871210719351f7597e02839b628 Mon Sep 17 00:00:00 2001
From: Steve Gill <stevengill97@gmail.com>
Date: Tue, 28 Feb 2017 17:56:01 -0800
Subject: [PATCH 08/11] Set VERSION to 4.0.3-dev (via coho)
---
package.json | 2 +-
plugin.xml | 217 +++++++++++++++++++++++++++++------------------
tests/plugin.xml | 33 +++++--
3 files changed, 162 insertions(+), 90 deletions(-)
diff --git a/package.json b/package.json
index 9e52c75..5637521 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-splashscreen",
- "version": "4.0.2",
+ "version": "4.0.3-dev",
"description": "Cordova Splashscreen Plugin",
"types": "./types/index.d.ts",
"cordova": {
diff --git a/plugin.xml b/plugin.xml
index 77fd2d8..5d77c5d 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,86 +1,135 @@
-<?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/>
+<?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.3-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" />
</js-module>
- </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>
+
+ <!-- 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>
</plugin>
diff --git a/tests/plugin.xml b/tests/plugin.xml
index 0288290..d71078c 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -1,6 +1,29 @@
-<?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"/>
+<?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.3-dev">
+ <name>Cordova Splashscreen Plugin Tests</name>
+ <license>Apache 2.0</license>
+
+ <js-module src="tests.js" name="tests">
+ </js-module>
</plugin>
From 13849c3d20cd732079eb3c3597f34856bdce7cf5 Mon Sep 17 00:00:00 2001
From: Steve Gill <stevengill97@gmail.com>
Date: Fri, 21 Apr 2017 19:26:24 -0700
Subject: [PATCH 09/11] CB-12685: added package.json to tests folder
---
tests/package.json | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 tests/package.json
diff --git a/tests/package.json b/tests/package.json
new file mode 100644
index 0000000..199a6f5
--- /dev/null
+++ 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"
+}
From 7c687957f8646954a09cc567a044b3af9a517002 Mon Sep 17 00:00:00 2001
From: Alexander Sorokin <alexander.sorokin@akvelon.com>
Date: Wed, 26 Apr 2017 16:30:20 +0300
Subject: [PATCH 10/11] CB-12622 Added Android 6.0 build badge to README
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index c317ae5..b2b8c19 100644
--- 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|
-|:-:|:-:|:-:|:-:|:-:|:-:|
-|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen/)|[](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|
+|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
+|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-6.0,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-splashscreen/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-splashscreen/)|[](https://travis-ci.org/apache/cordova-plugin-splashscreen)|
# cordova-plugin-splashscreen
From 85aa605a12d925087646f2e1a1b7585e0ec1e6f4 Mon Sep 17 00:00:00 2001
From: filmaj <maj.fil@gmail.com>
Date: Thu, 27 Apr 2017 13:05:08 -0700
Subject: [PATCH 11/11] CB-12736 Updated version and RELEASENOTES.md for
release 4.0.3 (via coho)
---
RELEASENOTES.md | 4 ++++
package.json | 2 +-
plugin.xml | 2 +-
tests/plugin.xml | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2a31446..9f153be 100644
--- 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`
diff --git a/package.json b/package.json
index 5637521..6d27992 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-splashscreen",
- "version": "4.0.3-dev",
+ "version": "4.0.3",
"description": "Cordova Splashscreen Plugin",
"types": "./types/index.d.ts",
"cordova": {
diff --git a/plugin.xml b/plugin.xml
index 5d77c5d..269785f 100644
--- 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.3-dev">
+ version="4.0.3">
<name>Splashscreen</name>
<description>Cordova Splashscreen Plugin</description>
<license>Apache 2.0</license>
diff --git a/tests/plugin.xml b/tests/plugin.xml
index d71078c..80f1f50 100644
--- 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.3-dev">
+ version="4.0.3">
<name>Cordova Splashscreen Plugin Tests</name>
<license>Apache 2.0</license>