Skip to content

Commit 53b4685

Browse files
ethanneffethanneff
authored
Merge pull request #349 from BranchMetrics/event-commerce
fix: updating dependencies
2 parents 21b9caa + 1fca206 commit 53b4685

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1392
-549
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ local.properties
1414
out/
1515
npm-debug.log*
1616
*.map
17-
yarn.lock
17+
package-lock.json
18+
yarn-error.log

‎CONTRIBUTING.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
*Questions? [Contact us](https://support.branch.io/support/tickets/new)*
44

5+
1. [Todo](#todo)
56
1. [Data Flow](#data-flow)
67
1. [Dependencies](#dependencies)
78
1. [Setup](#setup)
@@ -10,6 +11,12 @@
1011
1. [Submit](#submit)
1112
1. [Publish](#publish)
1213

14+
## TODO
15+
16+
- `<plugin name="branch-cordova-sdk" spec="../" />` or `cordova plugin add ../` causes an infinite loop when importing Branch on Cordova 7.0.1. Works on Cordova 6.5.0.
17+
- need to remove `TODO` from `init.sh` for `ios-sim` error
18+
- `cordova platform update [email protected]` added for Cordova 6.5.0 error on Android
19+
1320
## Data Flow
1421

1522
- [Users sets values](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/blob/master/testbed/config.template.xml#L6-L13)

‎package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "branch-cordova-sdk",
33
"description": "Branch Metrics Cordova SDK",
44
"main": "src/branch.js",
5-
"version": "2.6.5",
5+
"version": "2.6.6",
66
"homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
77
"repository": {
88
"type": "git",
@@ -41,6 +41,7 @@
4141
"precommit": "npm-check --skip-unused && gulp prod",
4242
"postcommit": "semantic-release pre --verifyRelease='./src/scripts/npm/updateNpmVersion' || true",
4343
"prerelease": "gulp prod",
44+
"dependencies": "npm-check -u",
4445
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
4546
},
4647
"dependencies": {
@@ -57,10 +58,10 @@
5758
"husky": "^0.14.3",
5859
"mkpath": "^1.0.0",
5960
"node-version-compare": "^1.0.1",
60-
"npm-check": "^5.4.4",
61+
"npm-check": "^5.4.5",
6162
"plist": "^2.1.0",
6263
"semantic-release": "^6.3.6",
63-
"validate-commit-msg": "^2.12.2",
64+
"validate-commit-msg": "^2.14.0",
6465
"xml2js": "^0.4.17"
6566
}
6667
}

‎plugin.template.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOFTWARE.
2424
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
id="branch-cordova-sdk"
27-
version="2.6.5">
27+
version="2.6.6">
2828

2929
<!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
3030

‎plugin.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOFTWARE.
2424
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
id="branch-cordova-sdk"
27-
version="2.6.5">
27+
version="2.6.6">
2828

2929
<!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
3030

@@ -101,6 +101,8 @@ SOFTWARE.
101101
<source-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.m" />
102102
<header-file src="src/ios/dependencies/Branch-SDK/BNCDebug.h" />
103103
<source-file src="src/ios/dependencies/Branch-SDK/BNCDebug.m" />
104+
<header-file src="src/ios/dependencies/Branch-SDK/BNCDeepLinkViewControllerInstance.h" />
105+
<source-file src="src/ios/dependencies/Branch-SDK/BNCDeepLinkViewControllerInstance.m" />
104106
<header-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.h" />
105107
<source-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.m" />
106108
<header-file src="src/ios/dependencies/Branch-SDK/BNCEncodingUtils.h" />

‎src/android/dependencies/Branch-2.8.0.jar renamed to ‎src/android/dependencies/Branch-2.10.3.jar

244 KB
Binary file not shown.

‎src/android/io/branch/BranchSDK.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,76 +91,76 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
9191

9292
if (action.equals("setDebug")) {
9393
if (args.length() == 1) {
94-
cordova.getThreadPool().execute(r);
94+
cordova.getActivity().runOnUiThread(r);
9595
}
9696
return true;
9797
} else if (action.equals("initSession")) {
98-
cordova.getThreadPool().execute(r);
98+
cordova.getActivity().runOnUiThread(r);
9999
return true;
100100
} else if (action.equals("setMixpanelToken")) {
101-
cordova.getThreadPool().execute(r);
101+
cordova.getActivity().runOnUiThread(r);
102102
return true;
103103
} else {
104104
if (this.instance != null) {
105105
if (action.equals("setIdentity")) {
106-
cordova.getThreadPool().execute(r);
106+
cordova.getActivity().runOnUiThread(r);
107107
return true;
108108
} else if (action.equals("userCompletedAction")) {
109109
if (args.length() < 1 && args.length() > 2) {
110110
callbackContext.error(String.format("Parameter mismatched. 1-2 is required but %d is given", args.length()));
111111
return false;
112112
}
113-
cordova.getThreadPool().execute(r);
113+
cordova.getActivity().runOnUiThread(r);
114114
return true;
115115
} else if (action.equals("sendCommerceEvent")) {
116116
if (args.length() < 1 && args.length() > 2) {
117117
callbackContext.error(String.format("Parameter mismatched. 1-2 is required but %d is given", args.length()));
118118
return false;
119119
}
120-
cordova.getThreadPool().execute(r);
120+
cordova.getActivity().runOnUiThread(r);
121121
return true;
122122
} else if (action.equals("getFirstReferringParams")) {
123-
cordova.getThreadPool().execute(r);
123+
cordova.getActivity().runOnUiThread(r);
124124
return true;
125125
} else if (action.equals("getLatestReferringParams")) {
126-
cordova.getThreadPool().execute(r);
126+
cordova.getActivity().runOnUiThread(r);
127127
return true;
128128
} else if (action.equals("logout")) {
129-
cordova.getThreadPool().execute(r);
129+
cordova.getActivity().runOnUiThread(r);
130130
return true;
131131
} else if (action.equals("loadRewards")) {
132-
cordova.getThreadPool().execute(r);
132+
cordova.getActivity().runOnUiThread(r);
133133
return true;
134134
} else if (action.equals("redeemRewards")) {
135135
if (args.length() < 1 && args.length() > 2) {
136136
callbackContext.error(String.format("Parameter mismatched. 1-2 is required but %d is given", args.length()));
137137
return false;
138138
}
139-
cordova.getThreadPool().execute(r);
139+
cordova.getActivity().runOnUiThread(r);
140140
return true;
141141
} else if (action.equals("getCreditHistory")) {
142-
cordova.getThreadPool().execute(r);
142+
cordova.getActivity().runOnUiThread(r);
143143
return true;
144144
} else if (action.equals("createBranchUniversalObject")) {
145145
if (args.length() != 1) {
146146
callbackContext.error(String.format("Parameter mismatched. 1 is required but %d is given", args.length()));
147147
return false;
148148
}
149-
cordova.getThreadPool().execute(r);
149+
cordova.getActivity().runOnUiThread(r);
150150
return true;
151151
} else if (action.equals(("generateShortUrl"))) {
152152
if (args.length() != 3) {
153153
callbackContext.error(String.format("Parameter mismatched. 3 is required but %d is given", args.length()));
154154
return false;
155155
}
156-
cordova.getThreadPool().execute(r);
156+
cordova.getActivity().runOnUiThread(r);
157157
return true;
158158
} else if (action.equals("registerView")) {
159159
if (args.length() != 1) {
160160
callbackContext.error(String.format("Parameter mismatched. 1 is required but %d is given", args.length()));
161161
return false;
162162
}
163-
cordova.getThreadPool().execute(r);
163+
cordova.getActivity().runOnUiThread(r);
164164
return true;
165165
} else if (action.equals("showShareSheet")) {
166166
if (args.length() < 3) {

‎src/ios/dependencies/Branch-SDK/BNCCommerceEvent.h

Lines changed: 198 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,203 @@ extern BNCProductCategory BNCProductCategorySportingGoods;
3737
extern BNCProductCategory BNCProductCategoryToysGames;
3838
extern BNCProductCategory BNCProductCategoryVehiclesParts;
3939

40+
#pragma mark - BNCCurrency
41+
42+
typedef NSString*const BNCCurrency;
43+
44+
extern BNCCurrency BNCCurrencyAED;
45+
extern BNCCurrency BNCCurrencyAFN;
46+
extern BNCCurrency BNCCurrencyALL;
47+
extern BNCCurrency BNCCurrencyAMD;
48+
extern BNCCurrency BNCCurrencyANG;
49+
extern BNCCurrency BNCCurrencyAOA;
50+
extern BNCCurrency BNCCurrencyARS;
51+
extern BNCCurrency BNCCurrencyAUD;
52+
extern BNCCurrency BNCCurrencyAWG;
53+
extern BNCCurrency BNCCurrencyAZN;
54+
extern BNCCurrency BNCCurrencyBAM;
55+
extern BNCCurrency BNCCurrencyBBD;
56+
57+
extern BNCCurrency BNCCurrencyBDT;
58+
extern BNCCurrency BNCCurrencyBGN;
59+
extern BNCCurrency BNCCurrencyBHD;
60+
extern BNCCurrency BNCCurrencyBIF;
61+
extern BNCCurrency BNCCurrencyBMD;
62+
extern BNCCurrency BNCCurrencyBND;
63+
extern BNCCurrency BNCCurrencyBOB;
64+
extern BNCCurrency BNCCurrencyBOV;
65+
extern BNCCurrency BNCCurrencyBRL;
66+
extern BNCCurrency BNCCurrencyBSD;
67+
extern BNCCurrency BNCCurrencyBTN;
68+
extern BNCCurrency BNCCurrencyBWP;
69+
70+
extern BNCCurrency BNCCurrencyBYN;
71+
extern BNCCurrency BNCCurrencyBYR;
72+
extern BNCCurrency BNCCurrencyBZD;
73+
extern BNCCurrency BNCCurrencyCAD;
74+
extern BNCCurrency BNCCurrencyCDF;
75+
extern BNCCurrency BNCCurrencyCHE;
76+
extern BNCCurrency BNCCurrencyCHF;
77+
extern BNCCurrency BNCCurrencyCHW;
78+
extern BNCCurrency BNCCurrencyCLF;
79+
extern BNCCurrency BNCCurrencyCLP;
80+
extern BNCCurrency BNCCurrencyCNY;
81+
extern BNCCurrency BNCCurrencyCOP;
82+
83+
extern BNCCurrency BNCCurrencyCOU;
84+
extern BNCCurrency BNCCurrencyCRC;
85+
extern BNCCurrency BNCCurrencyCUC;
86+
extern BNCCurrency BNCCurrencyCUP;
87+
extern BNCCurrency BNCCurrencyCVE;
88+
extern BNCCurrency BNCCurrencyCZK;
89+
extern BNCCurrency BNCCurrencyDJF;
90+
extern BNCCurrency BNCCurrencyDKK;
91+
extern BNCCurrency BNCCurrencyDOP;
92+
extern BNCCurrency BNCCurrencyDZD;
93+
extern BNCCurrency BNCCurrencyEGP;
94+
extern BNCCurrency BNCCurrencyERN;
95+
96+
extern BNCCurrency BNCCurrencyETB;
97+
extern BNCCurrency BNCCurrencyEUR;
98+
extern BNCCurrency BNCCurrencyFJD;
99+
extern BNCCurrency BNCCurrencyFKP;
100+
extern BNCCurrency BNCCurrencyGBP;
101+
extern BNCCurrency BNCCurrencyGEL;
102+
extern BNCCurrency BNCCurrencyGHS;
103+
extern BNCCurrency BNCCurrencyGIP;
104+
extern BNCCurrency BNCCurrencyGMD;
105+
extern BNCCurrency BNCCurrencyGNF;
106+
extern BNCCurrency BNCCurrencyGTQ;
107+
extern BNCCurrency BNCCurrencyGYD;
108+
109+
extern BNCCurrency BNCCurrencyHKD;
110+
extern BNCCurrency BNCCurrencyHNL;
111+
extern BNCCurrency BNCCurrencyHRK;
112+
extern BNCCurrency BNCCurrencyHTG;
113+
extern BNCCurrency BNCCurrencyHUF;
114+
extern BNCCurrency BNCCurrencyIDR;
115+
extern BNCCurrency BNCCurrencyILS;
116+
extern BNCCurrency BNCCurrencyINR;
117+
extern BNCCurrency BNCCurrencyIQD;
118+
extern BNCCurrency BNCCurrencyIRR;
119+
extern BNCCurrency BNCCurrencyISK;
120+
extern BNCCurrency BNCCurrencyJMD;
121+
122+
extern BNCCurrency BNCCurrencyJOD;
123+
extern BNCCurrency BNCCurrencyJPY;
124+
extern BNCCurrency BNCCurrencyKES;
125+
extern BNCCurrency BNCCurrencyKGS;
126+
extern BNCCurrency BNCCurrencyKHR;
127+
extern BNCCurrency BNCCurrencyKMF;
128+
extern BNCCurrency BNCCurrencyKPW;
129+
extern BNCCurrency BNCCurrencyKRW;
130+
extern BNCCurrency BNCCurrencyKWD;
131+
extern BNCCurrency BNCCurrencyKYD;
132+
extern BNCCurrency BNCCurrencyKZT;
133+
extern BNCCurrency BNCCurrencyLAK;
134+
135+
extern BNCCurrency BNCCurrencyLBP;
136+
extern BNCCurrency BNCCurrencyLKR;
137+
extern BNCCurrency BNCCurrencyLRD;
138+
extern BNCCurrency BNCCurrencyLSL;
139+
extern BNCCurrency BNCCurrencyLYD;
140+
extern BNCCurrency BNCCurrencyMAD;
141+
extern BNCCurrency BNCCurrencyMDL;
142+
extern BNCCurrency BNCCurrencyMGA;
143+
extern BNCCurrency BNCCurrencyMKD;
144+
extern BNCCurrency BNCCurrencyMMK;
145+
extern BNCCurrency BNCCurrencyMNT;
146+
extern BNCCurrency BNCCurrencyMOP;
147+
148+
extern BNCCurrency BNCCurrencyMRO;
149+
extern BNCCurrency BNCCurrencyMUR;
150+
extern BNCCurrency BNCCurrencyMVR;
151+
extern BNCCurrency BNCCurrencyMWK;
152+
extern BNCCurrency BNCCurrencyMXN;
153+
extern BNCCurrency BNCCurrencyMXV;
154+
extern BNCCurrency BNCCurrencyMYR;
155+
extern BNCCurrency BNCCurrencyMZN;
156+
extern BNCCurrency BNCCurrencyNAD;
157+
extern BNCCurrency BNCCurrencyNGN;
158+
extern BNCCurrency BNCCurrencyNIO;
159+
extern BNCCurrency BNCCurrencyNOK;
160+
161+
extern BNCCurrency BNCCurrencyNPR;
162+
extern BNCCurrency BNCCurrencyNZD;
163+
extern BNCCurrency BNCCurrencyOMR;
164+
extern BNCCurrency BNCCurrencyPAB;
165+
extern BNCCurrency BNCCurrencyPEN;
166+
extern BNCCurrency BNCCurrencyPGK;
167+
extern BNCCurrency BNCCurrencyPHP;
168+
extern BNCCurrency BNCCurrencyPKR;
169+
extern BNCCurrency BNCCurrencyPLN;
170+
extern BNCCurrency BNCCurrencyPYG;
171+
extern BNCCurrency BNCCurrencyQAR;
172+
extern BNCCurrency BNCCurrencyRON;
173+
174+
extern BNCCurrency BNCCurrencyRSD;
175+
extern BNCCurrency BNCCurrencyRUB;
176+
extern BNCCurrency BNCCurrencyRWF;
177+
extern BNCCurrency BNCCurrencySAR;
178+
extern BNCCurrency BNCCurrencySBD;
179+
extern BNCCurrency BNCCurrencySCR;
180+
extern BNCCurrency BNCCurrencySDG;
181+
extern BNCCurrency BNCCurrencySEK;
182+
extern BNCCurrency BNCCurrencySGD;
183+
extern BNCCurrency BNCCurrencySHP;
184+
extern BNCCurrency BNCCurrencySLL;
185+
extern BNCCurrency BNCCurrencySOS;
186+
187+
extern BNCCurrency BNCCurrencySRD;
188+
extern BNCCurrency BNCCurrencySSP;
189+
extern BNCCurrency BNCCurrencySTD;
190+
extern BNCCurrency BNCCurrencySYP;
191+
extern BNCCurrency BNCCurrencySZL;
192+
extern BNCCurrency BNCCurrencyTHB;
193+
extern BNCCurrency BNCCurrencyTJS;
194+
extern BNCCurrency BNCCurrencyTMT;
195+
extern BNCCurrency BNCCurrencyTND;
196+
extern BNCCurrency BNCCurrencyTOP;
197+
extern BNCCurrency BNCCurrencyTRY;
198+
extern BNCCurrency BNCCurrencyTTD;
199+
200+
extern BNCCurrency BNCCurrencyTWD;
201+
extern BNCCurrency BNCCurrencyTZS;
202+
extern BNCCurrency BNCCurrencyUAH;
203+
extern BNCCurrency BNCCurrencyUGX;
204+
extern BNCCurrency BNCCurrencyUSD;
205+
extern BNCCurrency BNCCurrencyUSN;
206+
extern BNCCurrency BNCCurrencyUYI;
207+
extern BNCCurrency BNCCurrencyUYU;
208+
extern BNCCurrency BNCCurrencyUZS;
209+
extern BNCCurrency BNCCurrencyVEF;
210+
extern BNCCurrency BNCCurrencyVND;
211+
extern BNCCurrency BNCCurrencyVUV;
212+
213+
extern BNCCurrency BNCCurrencyWST;
214+
extern BNCCurrency BNCCurrencyXAF;
215+
extern BNCCurrency BNCCurrencyXAG;
216+
extern BNCCurrency BNCCurrencyXAU;
217+
extern BNCCurrency BNCCurrencyXBA;
218+
extern BNCCurrency BNCCurrencyXBB;
219+
extern BNCCurrency BNCCurrencyXBC;
220+
extern BNCCurrency BNCCurrencyXBD;
221+
extern BNCCurrency BNCCurrencyXCD;
222+
extern BNCCurrency BNCCurrencyXDR;
223+
extern BNCCurrency BNCCurrencyXFU;
224+
extern BNCCurrency BNCCurrencyXOF;
225+
226+
extern BNCCurrency BNCCurrencyXPD;
227+
extern BNCCurrency BNCCurrencyXPF;
228+
extern BNCCurrency BNCCurrencyXPT;
229+
extern BNCCurrency BNCCurrencyXSU;
230+
extern BNCCurrency BNCCurrencyXTS;
231+
extern BNCCurrency BNCCurrencyXUA;
232+
extern BNCCurrency BNCCurrencyXXX;
233+
extern BNCCurrency BNCCurrencyYER;
234+
extern BNCCurrency BNCCurrencyZAR;
235+
extern BNCCurrency BNCCurrencyZMW;
236+
40237
#pragma mark - BNCProduct
41238

42239
@interface BNCProduct : NSObject
@@ -53,7 +250,7 @@ extern BNCProductCategory BNCProductCategoryVehiclesParts;
53250

54251
@interface BNCCommerceEvent : NSObject
55252
@property (nonatomic, strong) NSDecimalNumber *revenue;
56-
@property (nonatomic, strong) NSString *currency;
253+
@property (nonatomic, strong) BNCCurrency currency;
57254
@property (nonatomic, strong) NSString *transactionID;
58255
@property (nonatomic, strong) NSDecimalNumber *shipping;
59256
@property (nonatomic, strong) NSDecimalNumber *tax;

0 commit comments

Comments
 (0)