From a74510ba005f53c31fbcb832ac4859fe4ff2ce8d 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
 1.7.0

---
 RELEASENOTES.md  |  10 ++
 package.json     |   2 +-
 plugin.xml       | 419 ++++++++++++++++++++---------------------------
 tests/plugin.xml |  39 +----
 4 files changed, 195 insertions(+), 275 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4d86be2..d0995e5 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,16 @@
 -->
 # Release Notes
 
+### 1.6.2 (Feb 28, 2017)
+* [CB-12366](https://issues.apache.org/jira/browse/CB-12366) **iOS:** Reduce `tmpWindow` level to prevent overlapping statusbar
+* [CB-12364](https://issues.apache.org/jira/browse/CB-12364) **Windows:** `Inappbrowser` inject file manual tests are not working
+* [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-9148](https://issues.apache.org/jira/browse/CB-9148) **Android:** Add Support for `input[type=file]` File Chooser
+* [CB-11136](https://issues.apache.org/jira/browse/CB-11136) (ios) Fix `InAppBrowser` when closing with `WKWebView`
+* [CB-10799](https://issues.apache.org/jira/browse/CB-10799) **iOS:** fix toolbar is shown in incorrect position when in-call status bar
+
 ### 1.6.1 (Dec 14, 2016)
 * [CB-12237](https://issues.apache.org/jira/browse/CB-12237) - Update version in package.json to correct 1.6.1-dev
 * [CB-12236](https://issues.apache.org/jira/browse/CB-12236) - Fixed RELEASENOTES for cordova-plugin-inappbrowser
diff --git a/package.json b/package.json
index bd3355a..a62b083 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-inappbrowser",
-  "version": "1.6.2-dev",
+  "version": "1.7.0",
   "description": "Cordova InAppBrowser Plugin",
   "types": "./types/index.d.ts",
   "cordova": {
diff --git a/plugin.xml b/plugin.xml
index 3dac978..4e959b3 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,243 +1,178 @@
-<?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-inappbrowser"
-      version="1.6.2-dev">
-
-    <name>InAppBrowser</name>
-    <description>Cordova InAppBrowser Plugin</description>
-    <license>Apache 2.0</license>
-    <keywords>cordova,in,app,browser,inappbrowser</keywords>
-    <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser.git</repo>
-    <issue>https://issues.apache.org/jira/browse/CB/component/12320641</issue>
-
-    <engines>
-      <engine name="cordova" version=">=3.1.0" /><!-- Needs cordova/urlutil -->
-    </engines>
-
-    <!-- android -->
-    <platform name="android">
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <config-file target="res/xml/config.xml" parent="/*">
-            <feature name="InAppBrowser"> 
-                <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
-            </feature>
-        </config-file>
-
-        <source-file src="src/android/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" />
-        <source-file src="src/android/InAppBrowserDialog.java" target-dir="src/org/apache/cordova/inappbrowser" />
-        <source-file src="src/android/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
-
-        <!--  drawable src/android/resources -->
-        <resource-file src="src/android/res/drawable-hdpi/ic_action_next_item.png" target="res/drawable-hdpi/ic_action_next_item.png" />
-        <resource-file src="src/android/res/drawable-mdpi/ic_action_next_item.png" target="res/drawable-mdpi/ic_action_next_item.png" />
-        <resource-file src="src/android/res/drawable-xhdpi/ic_action_next_item.png" target="res/drawable-xhdpi/ic_action_next_item.png" />
-        <resource-file src="src/android/res/drawable-xxhdpi/ic_action_next_item.png" target="res/drawable-xxhdpi/ic_action_next_item.png" />
-
-        <resource-file src="src/android/res/drawable-hdpi/ic_action_previous_item.png" target="res/drawable-hdpi/ic_action_previous_item.png" />
-        <resource-file src="src/android/res/drawable-mdpi/ic_action_previous_item.png" target="res/drawable-mdpi/ic_action_previous_item.png" />
-        <resource-file src="src/android/res/drawable-xhdpi/ic_action_previous_item.png" target="res/drawable-xhdpi/ic_action_previous_item.png" />
-        <resource-file src="src/android/res/drawable-xxhdpi/ic_action_previous_item.png" target="res/drawable-xxhdpi/ic_action_previous_item.png" />
-
-        <resource-file src="src/android/res/drawable-hdpi/ic_action_remove.png" target="res/drawable-hdpi/ic_action_remove.png" />
-        <resource-file src="src/android/res/drawable-mdpi/ic_action_remove.png" target="res/drawable-mdpi/ic_action_remove.png" />
-        <resource-file src="src/android/res/drawable-xhdpi/ic_action_remove.png" target="res/drawable-xhdpi/ic_action_remove.png" />
-        <resource-file src="src/android/res/drawable-xxhdpi/ic_action_remove.png" target="res/drawable-xxhdpi/ic_action_remove.png" />
-
-    </platform>
-
-    <!-- amazon-fireos -->
-    <platform name="amazon-fireos">
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <config-file target="res/xml/config.xml" parent="/*">
-            <feature name="InAppBrowser"> 
-                <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
-            </feature>
-        </config-file>
-
-        <source-file src="src/amazon/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" />
-        <source-file src="src/android/InAppBrowserDialog.java" target-dir="src/org/apache/cordova/inappbrowser" />
-        <source-file src="src/amazon/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
-        
-        <!--  drawable src/android/resources -->
-        <resource-file src="src/android/res/drawable-hdpi/ic_action_next_item.png" target="res/drawable-hdpi/ic_action_next_item.png" />
-        <resource-file src="src/android/res/drawable-mdpi/ic_action_next_item.png" target="res/drawable-mdpi/ic_action_next_item.png" />
-        <resource-file src="src/android/res/drawable-xhdpi/ic_action_next_item.png" target="res/drawable-xhdpi/ic_action_next_item.png" />
-        <resource-file src="src/android/res/drawable-xxhdpi/ic_action_next_item.png" target="res/drawable-xxhdpi/ic_action_next_item.png" />
-        
-        <resource-file src="src/android/res/drawable-hdpi/ic_action_previous_item.png" target="res/drawable-hdpi/ic_action_previous_item.png" />
-        <resource-file src="src/android/res/drawable-mdpi/ic_action_previous_item.png" target="res/drawable-mdpi/ic_action_previous_item.png" />
-        <resource-file src="src/android/res/drawable-xhdpi/ic_action_previous_item.png" target="res/drawable-xhdpi/ic_action_previous_item.png" />
-        <resource-file src="src/android/res/drawable-xxhdpi/ic_action_previous_item.png" target="res/drawable-xxhdpi/ic_action_previous_item.png" />
-        
-        <resource-file src="src/android/res/drawable-hdpi/ic_action_remove.png" target="res/drawable-hdpi/ic_action_remove.png" />
-        <resource-file src="src/android/res/drawable-mdpi/ic_action_remove.png" target="res/drawable-mdpi/ic_action_remove.png" />
-        <resource-file src="src/android/res/drawable-xhdpi/ic_action_remove.png" target="res/drawable-xhdpi/ic_action_remove.png" />
-        <resource-file src="src/android/res/drawable-xxhdpi/ic_action_remove.png" target="res/drawable-xxhdpi/ic_action_remove.png" />
-    </platform>
-    
-    <!-- ubuntu -->
-    <platform name="ubuntu">
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <header-file src="src/ubuntu/inappbrowser.h" />
-        <source-file src="src/ubuntu/inappbrowser.cpp" />
-        <resource-file src="src/ubuntu/InAppBrowser.qml" />
-        <resource-file src="src/ubuntu/InAppBrowser_escapeScript.js" />
-        <resource-file src="src/ubuntu/close.png" />
-    </platform>
-
-    <!-- ios -->
-    <platform name="ios">
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>  
-        <config-file target="config.xml" parent="/*">
-            <feature name="InAppBrowser">
-                <param name="ios-package" value="CDVInAppBrowser" /> 
-            </feature>
-        </config-file>
-
-        <header-file src="src/ios/CDVInAppBrowser.h" />
-	    <source-file src="src/ios/CDVInAppBrowser.m" />
-	    
-	    <framework src="CoreGraphics.framework" />
-    </platform>
-
-    <!-- osx -->
-    <platform name="osx">
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <config-file target="config.xml" parent="/*">
-            <feature name="InAppBrowser">
-                <param name="osx-package" value="CDVInAppBrowser" />
-            </feature>
-        </config-file>
-
-        <header-file src="src/osx/CDVInAppBrowser.h" />
-        <source-file src="src/osx/CDVInAppBrowser.m" />
-    </platform>
-
-    <!-- wp7 -->
-    <platform name="wp7">
-        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
-            <Capability Name="ID_CAP_NETWORKING"/>
-        </config-file>
-
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <config-file target="config.xml" parent="/*">
-            <feature name="InAppBrowser">
-                <param name="wp-package" value="InAppBrowser"/>
-            </feature>
-        </config-file>
-
-        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
-            <Capability Name="ID_CAP_NETWORKING" />
-        </config-file>
-
-        <source-file src="src/wp/InAppBrowser.cs" />
-    </platform>
-
-    <!-- wp8 -->
-    <platform name="wp8">
-        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
-            <Capability Name="ID_CAP_NETWORKING"/>
-        </config-file>
-                
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <config-file target="config.xml" parent="/*">
-            <feature name="InAppBrowser">
-                <param name="wp-package" value="InAppBrowser"/>
-            </feature>
-        </config-file>
-
-        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
-            <Capability Name="ID_CAP_NETWORKING" />
-        </config-file>
-
-        <source-file src="src/wp/InAppBrowser.cs" />
-    </platform>
-
-    <!-- windows8 -->
-    <platform name="windows8">
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <js-module src="www/windows8/InAppBrowserProxy.js" name="InAppBrowserProxy">
-            <merges target="" />
-        </js-module>
-    </platform>
-
-    <!-- windows universal apps (Windows 8.1, Windows Phone 8.1, Windows 8.0) -->
-    <platform name="windows">
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <js-module src="src/windows/InAppBrowserProxy.js" name="InAppBrowserProxy">
-            <runs />
-        </js-module>
-        <asset src="www/inappbrowser.css" target="css/inappbrowser.css" />
-    </platform>
-
-    <!-- firefoxos -->
-    <platform name="firefoxos">
-        <config-file target="config.xml" parent="/*">
-            <permission name="browser" description="Enables the app to implement a browser in an iframe." privileged="true"/>
-        </config-file>
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <js-module src="src/firefoxos/InAppBrowserProxy.js" name="InAppBrowserProxy">
-            <runs />
-        </js-module>
-    </platform>
-
-    <!-- browser -->
-    <platform name="browser">
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <js-module src="src/browser/InAppBrowserProxy.js" name="InAppBrowserProxy">
-            <runs />
-        </js-module>
-    </platform>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-inappbrowser" version="1.7.0">
+  <name>InAppBrowser</name>
+  <description>Cordova InAppBrowser Plugin</description>
+  <license>Apache 2.0</license>
+  <keywords>cordova,in,app,browser,inappbrowser</keywords>
+  <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser.git</repo>
+  <issue>https://issues.apache.org/jira/browse/CB/component/12320641</issue>
+  <engines>
+    <engine name="cordova" version=">=3.1.0"/>
+  </engines>
+  <platform name="android">
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <config-file target="res/xml/config.xml" parent="/*">
+      <feature name="InAppBrowser">
+        <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
+      </feature>
+    </config-file>
+    <source-file src="src/android/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser"/>
+    <source-file src="src/android/InAppBrowserDialog.java" target-dir="src/org/apache/cordova/inappbrowser"/>
+    <source-file src="src/android/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser"/>
+    <resource-file src="src/android/res/drawable-hdpi/ic_action_next_item.png" target="res/drawable-hdpi/ic_action_next_item.png"/>
+    <resource-file src="src/android/res/drawable-mdpi/ic_action_next_item.png" target="res/drawable-mdpi/ic_action_next_item.png"/>
+    <resource-file src="src/android/res/drawable-xhdpi/ic_action_next_item.png" target="res/drawable-xhdpi/ic_action_next_item.png"/>
+    <resource-file src="src/android/res/drawable-xxhdpi/ic_action_next_item.png" target="res/drawable-xxhdpi/ic_action_next_item.png"/>
+    <resource-file src="src/android/res/drawable-hdpi/ic_action_previous_item.png" target="res/drawable-hdpi/ic_action_previous_item.png"/>
+    <resource-file src="src/android/res/drawable-mdpi/ic_action_previous_item.png" target="res/drawable-mdpi/ic_action_previous_item.png"/>
+    <resource-file src="src/android/res/drawable-xhdpi/ic_action_previous_item.png" target="res/drawable-xhdpi/ic_action_previous_item.png"/>
+    <resource-file src="src/android/res/drawable-xxhdpi/ic_action_previous_item.png" target="res/drawable-xxhdpi/ic_action_previous_item.png"/>
+    <resource-file src="src/android/res/drawable-hdpi/ic_action_remove.png" target="res/drawable-hdpi/ic_action_remove.png"/>
+    <resource-file src="src/android/res/drawable-mdpi/ic_action_remove.png" target="res/drawable-mdpi/ic_action_remove.png"/>
+    <resource-file src="src/android/res/drawable-xhdpi/ic_action_remove.png" target="res/drawable-xhdpi/ic_action_remove.png"/>
+    <resource-file src="src/android/res/drawable-xxhdpi/ic_action_remove.png" target="res/drawable-xxhdpi/ic_action_remove.png"/>
+  </platform>
+  <platform name="amazon-fireos">
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <config-file target="res/xml/config.xml" parent="/*">
+      <feature name="InAppBrowser">
+        <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
+      </feature>
+    </config-file>
+    <source-file src="src/amazon/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser"/>
+    <source-file src="src/android/InAppBrowserDialog.java" target-dir="src/org/apache/cordova/inappbrowser"/>
+    <source-file src="src/amazon/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser"/>
+    <resource-file src="src/android/res/drawable-hdpi/ic_action_next_item.png" target="res/drawable-hdpi/ic_action_next_item.png"/>
+    <resource-file src="src/android/res/drawable-mdpi/ic_action_next_item.png" target="res/drawable-mdpi/ic_action_next_item.png"/>
+    <resource-file src="src/android/res/drawable-xhdpi/ic_action_next_item.png" target="res/drawable-xhdpi/ic_action_next_item.png"/>
+    <resource-file src="src/android/res/drawable-xxhdpi/ic_action_next_item.png" target="res/drawable-xxhdpi/ic_action_next_item.png"/>
+    <resource-file src="src/android/res/drawable-hdpi/ic_action_previous_item.png" target="res/drawable-hdpi/ic_action_previous_item.png"/>
+    <resource-file src="src/android/res/drawable-mdpi/ic_action_previous_item.png" target="res/drawable-mdpi/ic_action_previous_item.png"/>
+    <resource-file src="src/android/res/drawable-xhdpi/ic_action_previous_item.png" target="res/drawable-xhdpi/ic_action_previous_item.png"/>
+    <resource-file src="src/android/res/drawable-xxhdpi/ic_action_previous_item.png" target="res/drawable-xxhdpi/ic_action_previous_item.png"/>
+    <resource-file src="src/android/res/drawable-hdpi/ic_action_remove.png" target="res/drawable-hdpi/ic_action_remove.png"/>
+    <resource-file src="src/android/res/drawable-mdpi/ic_action_remove.png" target="res/drawable-mdpi/ic_action_remove.png"/>
+    <resource-file src="src/android/res/drawable-xhdpi/ic_action_remove.png" target="res/drawable-xhdpi/ic_action_remove.png"/>
+    <resource-file src="src/android/res/drawable-xxhdpi/ic_action_remove.png" target="res/drawable-xxhdpi/ic_action_remove.png"/>
+  </platform>
+  <platform name="ubuntu">
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <header-file src="src/ubuntu/inappbrowser.h"/>
+    <source-file src="src/ubuntu/inappbrowser.cpp"/>
+    <resource-file src="src/ubuntu/InAppBrowser.qml"/>
+    <resource-file src="src/ubuntu/InAppBrowser_escapeScript.js"/>
+    <resource-file src="src/ubuntu/close.png"/>
+  </platform>
+  <platform name="ios">
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <config-file target="config.xml" parent="/*">
+      <feature name="InAppBrowser">
+        <param name="ios-package" value="CDVInAppBrowser"/>
+      </feature>
+    </config-file>
+    <header-file src="src/ios/CDVInAppBrowser.h"/>
+    <source-file src="src/ios/CDVInAppBrowser.m"/>
+    <framework src="CoreGraphics.framework"/>
+  </platform>
+  <platform name="osx">
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <config-file target="config.xml" parent="/*">
+      <feature name="InAppBrowser">
+        <param name="osx-package" value="CDVInAppBrowser"/>
+      </feature>
+    </config-file>
+    <header-file src="src/osx/CDVInAppBrowser.h"/>
+    <source-file src="src/osx/CDVInAppBrowser.m"/>
+  </platform>
+  <platform name="wp7">
+    <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+      <Capability Name="ID_CAP_NETWORKING"/>
+    </config-file>
+    <config-file target="config.xml" parent="/*">
+      <feature name="InAppBrowser">
+        <param name="wp-package" value="InAppBrowser"/>
+      </feature>
+    </config-file>
+    <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+      <Capability Name="ID_CAP_NETWORKING"/>
+    </config-file>
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <source-file src="src/wp/InAppBrowser.cs"/>
+  </platform>
+  <platform name="wp8">
+    <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+      <Capability Name="ID_CAP_NETWORKING"/>
+    </config-file>
+    <config-file target="config.xml" parent="/*">
+      <feature name="InAppBrowser">
+        <param name="wp-package" value="InAppBrowser"/>
+      </feature>
+    </config-file>
+    <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+      <Capability Name="ID_CAP_NETWORKING"/>
+    </config-file>
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <source-file src="src/wp/InAppBrowser.cs"/>
+  </platform>
+  <platform name="windows8">
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <js-module src="www/windows8/InAppBrowserProxy.js" name="InAppBrowserProxy">
+      <merges target=""/>
+    </js-module>
+  </platform>
+  <platform name="windows">
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <js-module src="src/windows/InAppBrowserProxy.js" name="InAppBrowserProxy">
+      <runs/>
+    </js-module>
+    <asset src="www/inappbrowser.css" target="css/inappbrowser.css"/>
+  </platform>
+  <platform name="firefoxos">
+    <config-file target="config.xml" parent="/*">
+      <permission name="browser" description="Enables the app to implement a browser in an iframe." privileged="true"/>
+    </config-file>
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <js-module src="src/firefoxos/InAppBrowserProxy.js" name="InAppBrowserProxy">
+      <runs/>
+    </js-module>
+  </platform>
+  <platform name="browser">
+    <js-module src="www/inappbrowser.js" name="inappbrowser">
+      <clobbers target="cordova.InAppBrowser.open"/>
+      <clobbers target="window.open"/>
+    </js-module>
+    <js-module src="src/browser/InAppBrowserProxy.js" name="InAppBrowserProxy">
+      <runs/>
+    </js-module>
+  </platform>
 </plugin>
diff --git a/tests/plugin.xml b/tests/plugin.xml
index 5c1debc..518abab 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -1,33 +1,8 @@
-<?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-inappbrowser-tests"
-    version="1.6.2-dev">
-    <name>Cordova InAppBrowser Plugin Tests</name>
-    <license>Apache 2.0</license>
-
-    <dependency id="cordova-plugin-dialogs" />
-
-    <js-module src="tests.js" name="tests">
-    </js-module>
-
-    <asset src="resources" target="cdvtests/iab-resources" />
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-inappbrowser-tests" version="1.7.0">
+  <name>Cordova InAppBrowser Plugin Tests</name>
+  <license>Apache 2.0</license>
+  <dependency id="cordova-plugin-dialogs"/>
+  <js-module src="tests.js" name="tests"/>
+  <asset src="resources" target="cdvtests/iab-resources"/>
 </plugin>