Skip to content

Commit bb71502

Browse files
committed
Merge branch 'develop'
2 parents 192cf98 + dc63861 commit bb71502

File tree

4 files changed

+27
-7
lines changed

4 files changed

+27
-7
lines changed

plugin.xml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
id="com.phonegap.plugins.oauthio"
5-
version="0.1.1">
5+
version="0.2.1">
66

77
<name>OAuth.io</name>
88

@@ -18,9 +18,29 @@
1818
<merges target="OAuth" />
1919
</js-module>
2020

21-
<config-file target="config.xml" parent="/*">
22-
<access origin="https://oauth.io" />
23-
</config-file>
21+
<platform name="android">
22+
<config-file target="res/xml/config.xml" parent="/*">
23+
<access origin="https://oauth.io" />
24+
</config-file>
25+
</platform>
26+
27+
<platform name="ios">
28+
<config-file target="config.xml" parent="/*">
29+
<access origin="https://oauth.io" />
30+
</config-file>
31+
</platform>
32+
33+
<platform name="wp7">
34+
<config-file target="config.xml" parent="/*">
35+
<access origin="https://oauth.io" />
36+
</config-file>
37+
</platform>
38+
39+
<platform name="wp8">
40+
<config-file target="config.xml" parent="/*">
41+
<access origin="https://oauth.io" />
42+
</config-file>
43+
</platform>
2444

2545
<engines>
2646
<engine name="cordova" version=">=3.0.0" />

www/dist/oauth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
module.exports = {
33
oauthd_url: "https://oauth.io",
44
oauthd_api: "https://oauth.io/api",
5-
version: "phonegap-0.2.0",
5+
version: "phonegap-0.2.1",
66
options: {}
77
};
88

www/dist/oauth.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

www/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "oauth-js",
3-
"version": "0.2.0",
3+
"version": "0.2.1",
44
"description": "OAuth that just works",
55
"main": "dist/oauth.min.js",
66
"directories": {

0 commit comments

Comments
 (0)