Merge branch 'develop'

oauth-io · Jun 12, 2014 · bb71502 · bb71502
2 parents 192cf98 + dc63861
commit bb71502
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="com.phonegap.plugins.oauthio"
-    version="0.1.1">
+    version="0.2.1">
 
     <name>OAuth.io</name>
 
@@ -18,9 +18,29 @@
         <merges target="OAuth" />
     </js-module>
 
-    <config-file target="config.xml" parent="/*">
-      <access origin="https://oauth.io" />
-    </config-file>
+    <platform name="android">        
+        <config-file target="res/xml/config.xml" parent="/*">
+          <access origin="https://oauth.io" />
+        </config-file>
+    </platform>
+
+    <platform name="ios">
+        <config-file target="config.xml" parent="/*">
+          <access origin="https://oauth.io" />
+        </config-file>
+    </platform>
+
+    <platform name="wp7">
+      <config-file target="config.xml" parent="/*">
+          <access origin="https://oauth.io" />
+      </config-file>
+    </platform>
+
+    <platform name="wp8">
+      <config-file target="config.xml" parent="/*">
+          <access origin="https://oauth.io" />
+      </config-file>  
+    </platform>
 
     <engines>
       <engine name="cordova" version=">=3.0.0" />

diff --git a/www/dist/oauth.js b/www/dist/oauth.js
@@ -2,7 +2,7 @@
 module.exports = {
   oauthd_url: "https://oauth.io",
   oauthd_api: "https://oauth.io/api",
-  version: "phonegap-0.2.0",
+  version: "phonegap-0.2.1",
   options: {}
 };
 

diff --git a/www/dist/oauth.min.js b/www/dist/oauth.min.js
diff --git a/www/package.json b/www/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oauth-js",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "OAuth that just works",
   "main": "dist/oauth.min.js",
   "directories": {