Skip to content

Commit fabe427

Browse files
authored
Merge pull request #238 from BranchMetrics/eneff_fix
fix: fixed .map error, fixed Android tags, fixed iOS dependencies, updated Testbed style, updated iOS SDK
2 parents 21620c1 + e41e3da commit fabe427

Some content is hidden

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

62 files changed

+1357
-816
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ testbed/platforms
33
testbed/plugins
44
testbed/hooks
55
node_modules
6-
testbed/ul_web_hooks/
76
.installed
87
.gradle/
98
.idea/
@@ -12,3 +11,4 @@ local.properties
1211
out/
1312
src/cordova-ionic-phonegap-branch-deep-linking.iml
1413
npm-debug.log
14+
*.map

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
All notable changes to the Branch Web SDK will be documented here.
33
The Branch Web SDK adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [v2.3.2] - 2016-11-15
6+
- Fixed .map console error [image](https://cloud.githubusercontent.com/assets/2933593/19788120/7ba0a9e6-9c5b-11e6-90b1-ae669102fcea.png)
7+
- Fixed missing dependencies within npm [#226](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/226)
8+
- Fixed Branch tags on Android [image](https://cloud.githubusercontent.com/assets/2933593/20316177/aaddf6e6-ab15-11e6-94f4-a0f3b4ad8dc6.png)
9+
- Fixed setDebug() in the testbed app
10+
- Removed node modules and map files from repo
11+
- Updated the testbed app appearance
12+
- Updated iOS SDK to 0.12.16
13+
- Updated docs on how to contribute to the SDK
14+
515
## [v2.2.2] - 2016-09-15
616
- Updated iOS library to v 0.12.11
717
- Added back support for setDebug

DEVELOPING.md

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
# Developing the SDK Locally
2+
*Questions? [Contact us](https://support.branch.io/support/tickets/new)*
3+
4+
1. [Dependencies](#dependencies)
5+
1. [SDK](#sdk)
6+
1. [Develop](#develop)
7+
1. [Validate](#validate)
8+
1. [Test](#test)
9+
1. [Submit](#submit)
10+
11+
#
12+
13+
### Dependencies
14+
15+
> Homebrew
16+
17+
```sh
18+
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)";
19+
brew update;
20+
brew doctor;
21+
export PATH="/usr/local/bin:$PATH";
22+
```
23+
24+
> Node
25+
26+
```sh
27+
brew install node;
28+
```
29+
30+
> Gulp
31+
32+
```sh
33+
npm install -g gulp-cli;
34+
```
35+
36+
### SDK
37+
38+
> Local
39+
40+
```sh
41+
git clone [email protected]:BranchMetrics/cordova-ionic-phonegap-branch-deep-linking.git;
42+
cd cordova-ionic-phonegap-branch-deep-linking;
43+
rm -rf node_modules;
44+
npm install;
45+
```
46+
47+
### Develop
48+
49+
> Code in .es6 files
50+
51+
### Validate
52+
53+
> Build
54+
55+
```sh
56+
gulp predev;
57+
```
58+
59+
> **[optional]** Update [iOS SDK](https://github.com/BranchMetrics/ios-branch-deep-linking/tags) (will need to update `plugin.xml` dependencies if new iOS files)
60+
61+
```sh
62+
./src/ios/dependencies/update.sh 0.12.14;
63+
```
64+
65+
### Test
66+
67+
> Modify `BRANCH_KEY` and `URI_SCHEME` and `config.xml` to values in [Branch Dashboard](https://dashboard.branch.io/settings/link)
68+
69+
```sh
70+
cd testbed;
71+
npm install -g cordova;
72+
73+
cordova platform remove ios;
74+
cordova platform remove android;
75+
cordova platform remove browser;
76+
77+
cordova plugin remove io.branch.sdk;
78+
cordova plugin add ../ --variable BRANCH_KEY=key_live_icCccJIpd7GlYY5oOmoEtpafuDiuyXhT --variable URI_SCHEME=enefftest;
79+
80+
cordova platform add ios;
81+
cordova platform add android;
82+
83+
cordova build ios;
84+
cordova build android;
85+
```
86+
87+
> Validate all features on both `iOS` and `Android` on `device` only (no `simulator` or `TestFlight`)
88+
89+
```sh
90+
cordova build ios;
91+
open -a Xcode platforms/ios/Branch\ Testing.xcworkspace;
92+
```
93+
```sh
94+
cordova run android;
95+
chrome://inspect/#devices
96+
```
97+
98+
> Test harnesses `TODO`
99+
100+
### Submit
101+
102+
> Submit code with a [pull request](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking)
103+
104+
```sh
105+
git checkout -b BRANCH_NAME;
106+
git add FILE_NAME;
107+
npm run commit;
108+
git push origin BRANCH_NAME;
109+
```
110+
111+
### Publish
112+
113+
> Update `CHANGELOG.md`
114+
> Update version within plugin.template.xml
115+
> Run `gulp prerelease`
116+
> Merge Pull Request - code to NPM will happen automatically

gulpfile.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var eslint = require('gulp-eslint');
66
var jscs = require('gulp-jscs');
77

88
gulp.task('prerelease', [ 'setupNpm', 'babel', 'lint' ]);
9+
gulp.task('predev', [ 'setupDev', 'babel', 'lint' ]);
910

1011
// -----------------------------------------------------------------------------
1112
// setup for development use
@@ -101,7 +102,6 @@ function babelize(taskName, dir) {
101102
.pipe(babel({
102103
presets: [ 'es2015', 'stage-2' ]
103104
}))
104-
.pipe(sourcemaps.write('.'))
105105
.pipe(gulp.dest(destDir));
106106
});
107107
}
@@ -142,7 +142,6 @@ function jscsTask(fix) {
142142
.pipe(jscs({ fix: fix }))
143143
.pipe(jscs.reporter())
144144
.pipe(jscs.reporter('fail'));
145-
146145
if (fix) {
147146
ret.pipe(gulp.dest('.'));
148147
}

hooks/afterPrepareHook.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,4 @@ function activateUniversalLinksInIos(cordovaContext, pluginPreferences) {
7979

8080
// generate entitlements file
8181
iosProjectEntitlements.generateAssociatedDomainsEntitlements(cordovaContext, pluginPreferences);
82-
}
83-
//# sourceMappingURL=afterPrepareHook.js.map
82+
}

hooks/afterPrepareHook.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

hooks/beforePluginInstallHook.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,4 @@ module.exports = function (ctx) {
152152
installRequiredNodeModules(modules);
153153

154154
createPluginInstalledFlag(ctx);
155-
};
156-
//# sourceMappingURL=beforePluginInstallHook.js.map
155+
};

hooks/beforePluginInstallHook.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

hooks/iosBeforePrepareHook.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,4 @@ function getOldProjectName(projectDir) {
7777
return projectName;
7878
}
7979

80-
// endregion
81-
//# sourceMappingURL=iosBeforePrepareHook.js.map
80+
// endregion

hooks/iosBeforePrepareHook.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)