Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: [v3.0.0] install Branch SDK from config.xml #261

Merged
merged 131 commits into from
Mar 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
a35e294
chore: remove old hooks
ethanneff Dec 14, 2016
c518965
fix: added hooks for plist and associated domains
ethanneff Dec 14, 2016
3e973e2
fix: added hooks for after_prepare and before_plugin_install
ethanneff Dec 14, 2016
a6fb43e
chore: moved node dependencies hook
ethanneff Dec 14, 2016
b0ef3f7
chore: moved android manifest hook
ethanneff Dec 14, 2016
ed4b7a7
chore: moved config xml hook
ethanneff Dec 14, 2016
b1bf75d
fix: removed version from plugin.xml since not updated
ethanneff Dec 14, 2016
7a8b464
style: indention on plugin.xml
ethanneff Dec 14, 2016
d299cd7
style: renamed the entry hooks
ethanneff Dec 14, 2016
70c3d10
style: replaced spaces to tabs
ethanneff Dec 14, 2016
4a641ac
fix: iOS hooks depend on config.xml instead of plugin.xml
ethanneff Dec 14, 2016
a7c9847
fix: updated testbed to rely on config.xml instead of plugin.xml
ethanneff Dec 14, 2016
943847f
fix: removed unused npm dependencies
ethanneff Dec 15, 2016
d5f1006
chore: removed unused android gradle dependency
ethanneff Dec 15, 2016
ba5447f
style: changed from enlist to standard
ethanneff Dec 15, 2016
dec6dbe
chore: remove old hooks
ethanneff Dec 14, 2016
8d80431
fix: added hooks for plist and associated domains
ethanneff Dec 14, 2016
1e6cb10
fix: added hooks for after_prepare and before_plugin_install
ethanneff Dec 14, 2016
b1bcdd8
chore: moved node dependencies hook
ethanneff Dec 14, 2016
1b2a375
chore: moved android manifest hook
ethanneff Dec 14, 2016
a27377a
chore: moved config xml hook
ethanneff Dec 14, 2016
681c034
fix: removed version from plugin.xml since not updated
ethanneff Dec 14, 2016
1a10eac
style: indention on plugin.xml
ethanneff Dec 14, 2016
8e8c88d
style: renamed the entry hooks
ethanneff Dec 14, 2016
d7bbc34
style: replaced spaces to tabs
ethanneff Dec 14, 2016
6c77438
fix: iOS hooks depend on config.xml instead of plugin.xml
ethanneff Dec 14, 2016
76a0b97
fix: updated testbed to rely on config.xml instead of plugin.xml
ethanneff Dec 14, 2016
df04956
fix: removed unused npm dependencies
ethanneff Dec 15, 2016
ae73a97
chore: removed unused android gradle dependency
ethanneff Dec 15, 2016
71497fe
style: changed from enlist to standard
ethanneff Dec 15, 2016
5775581
chore: merge remote-tracking branch 'origin/fix_plugin_install_from_c…
ethanneff Dec 15, 2016
5043b84
chore: removed unused files
ethanneff Dec 16, 2016
7bf6eec
style: force conventional commit types
ethanneff Dec 16, 2016
937ac03
docs: add development team to silence error
ethanneff Dec 16, 2016
a97f338
fix: remove es6
ethanneff Dec 16, 2016
92b0f0f
chore: remove all npm-debug from repo
ethanneff Dec 16, 2016
81329e2
docs: updated rebuild for new testing
ethanneff Dec 16, 2016
822394a
style: change indention to 2 spaces and rename
ethanneff Dec 16, 2016
00ae0b1
fix: remove unused npm dependency
ethanneff Dec 16, 2016
7d46741
fix: move node dependency install for async
ethanneff Dec 16, 2016
534d64c
refactor: only pass preference for after prepare
ethanneff Dec 16, 2016
a5bd04b
feat: hook to update development team for ios
ethanneff Dec 16, 2016
8cab579
style: fix spelling
ethanneff Dec 16, 2016
4b74b34
chore: merged with master
ethanneff Jan 5, 2017
892bd36
chore: added note about broken plugin xml version
ethanneff Jan 6, 2017
f5a9c35
chore: merged with master
ethanneff Jan 9, 2017
0854b78
docs: fixed build dependency error
ethanneff Jan 9, 2017
9656bad
style: updated indention
ethanneff Jan 9, 2017
01481a2
fix: added branch logo and splash to testbed
ethanneff Jan 9, 2017
bcf1d53
fix: added a rebuild script for the testbed
ethanneff Jan 9, 2017
d8fb3a0
style: changed from underscore to camelcase
ethanneff Jan 9, 2017
96cf239
chore: changed to console.error for more visibility
ethanneff Jan 9, 2017
2600c2a
chore: removed un-used configXmlHelper
ethanneff Jan 9, 2017
f540a1e
chore: relocated actions outside of main hooks
ethanneff Jan 9, 2017
aa297bb
style: renamed parameters
ethanneff Jan 9, 2017
71844ce
docs: added semantic release prefix
ethanneff Jan 9, 2017
099d70b
chore: added android to hook
ethanneff Jan 9, 2017
2983bf2
chore: added comments and reordered functions
ethanneff Jan 9, 2017
fe00482
fix: removed /etc artifact
ethanneff Jan 9, 2017
25053e6
chore: enabled xcode preferences
ethanneff Jan 9, 2017
96f7425
fix: updated testbed for correct share sheet navigation
ethanneff Jan 10, 2017
1618d33
chore: updated comments
ethanneff Jan 10, 2017
80173ce
chore: remove android config from plugin.xml
ethanneff Jan 10, 2017
5374aad
style: updated icon and splash for testbed
ethanneff Jan 10, 2017
b082dba
style: updated branch.js to standard javasc
ethanneff Jan 18, 2017
0df2da9
docs: removed developing for contributing
ethanneff Jan 18, 2017
7e94359
chore: removed test link domain from associated domains
ethanneff Jan 18, 2017
fac6d78
fix: updated android hook to update androidmanifest.xml
ethanneff Jan 18, 2017
6a73e96
test: updated docs for android testing
ethanneff Jan 18, 2017
7fe27fc
fix: changed hook to after_prepare
ethanneff Jan 18, 2017
79b0642
chore: added console logging for hooks
ethanneff Jan 18, 2017
67774e0
refactor: renamed afterprepare hook
ethanneff Jan 18, 2017
92ad6fa
chore: added hook logging
ethanneff Jan 18, 2017
70232f1
feat: corrected Android Manifest hook
ethanneff Jan 18, 2017
d91939b
fix: onDeviceReady to onDeviceResume in testbed
ethanneff Jan 20, 2017
447fa78
chore: updated comments
ethanneff Jan 31, 2017
7ab4c69
style: updated when console log updates user
ethanneff Jan 31, 2017
798f9c0
fix: reverted from after_compile to after_prepare to catch cordova ru…
ethanneff Jan 31, 2017
eadf928
chore: temp remove ci error
ethanneff Jan 31, 2017
7d3f2fa
feat: associated domains appends instead of replace
ethanneff Jan 31, 2017
b41bd62
chore: removed ci errors
ethanneff Jan 31, 2017
9d4a9e8
docs: added comments
ethanneff Feb 1, 2017
ad58a7a
docs: added guidance on updating hooks
ethanneff Feb 1, 2017
1fc2ec6
fix: android manifest now uses main activity
ethanneff Feb 1, 2017
e0841a8
refactor: removed class level variables
ethanneff Feb 1, 2017
fcf43b7
Merge branch 'master' of github.com:BranchMetrics/cordova-ionic-phone…
ethanneff Feb 2, 2017
ecc03e8
fix: error on blank state of associated domains
ethanneff Feb 9, 2017
c9a04d9
chore: changed logging messages
ethanneff Feb 9, 2017
6b43823
feat: added build.json for iOS development team
ethanneff Feb 9, 2017
115484b
test: updated rebuild.sh for iOS testing
ethanneff Feb 9, 2017
35e59c6
Merge branch 'master' of github.com:BranchMetrics/cordova-ionic-phone…
ethanneff Feb 10, 2017
4a725c6
fix: updated docs and testbed to new specs
ethanneff Feb 10, 2017
e71c2a4
chore: updated to iOS 0.12.27
ethanneff Feb 10, 2017
0ffeb99
style: 4 spaces to 2
ethanneff Feb 10, 2017
1cb5f63
feat: added arguments to testbed init
ethanneff Feb 10, 2017
d9708a5
chore: updated to iOS 0.12.27 dependencies
ethanneff Feb 10, 2017
7577253
chore: updated testbed account
ethanneff Feb 10, 2017
c57e476
chore: renamed test harnesses id
ethanneff Feb 10, 2017
ee9a400
style: renamed testbed script
ethanneff Feb 10, 2017
ed57d8f
chore: renamed testbed script
ethanneff Feb 10, 2017
9ede660
refactor: validated bash code
ethanneff Feb 10, 2017
b0640ea
refactor: organized script into functions
ethanneff Feb 10, 2017
b849936
refactor: style change to script
ethanneff Feb 10, 2017
49d4599
chore: merged into master
ethanneff Feb 16, 2017
29ba593
docs: update examples in testbed and readme
ethanneff Feb 17, 2017
6bbdb37
fix: updated android sdk from 2.4.0 to 2.5.8
ethanneff Feb 24, 2017
63e3dd0
feat: no longer need to launch through Xcode to set provisioning prof…
ethanneff Mar 1, 2017
2d334b5
chore: added node devDependencies to dependencies
ethanneff Mar 1, 2017
056ad4c
fix: added iAd framework for Apple Search Ads
ethanneff Mar 1, 2017
0b25db8
fix: testbed bundle id cannot have _ or -
ethanneff Mar 1, 2017
5a5bd2d
docs: updated images to match testbed
ethanneff Mar 1, 2017
ea73739
docs: fixed Branch missing error on Ionic 2
ethanneff Mar 1, 2017
f8dcd57
docs: updated aasa wait time since ahmed updated
ethanneff Mar 1, 2017
c3a5e9c
docs: added compiling errors and solutions
ethanneff Mar 1, 2017
1a8f976
docs: fixed trailing spaces
ethanneff Mar 1, 2017
f21736b
chore: fixed travis ci errors
ethanneff Mar 2, 2017
fb9b864
style: standardized error messages
ethanneff Mar 2, 2017
19c6045
style: added comment and reordered sections
ethanneff Mar 2, 2017
865b68a
fix: android URI Scheme
ethanneff Mar 2, 2017
a72b833
docs: removed 15 min wait for aasa update
ethanneff Mar 2, 2017
d980c1b
docs: style change for apps
ethanneff Mar 2, 2017
6419361
fix: prevent crash on list on spotlight on android
ethanneff Mar 2, 2017
03a5f1a
style: removed redundant comments found in readme
ethanneff Mar 2, 2017
aa4173d
perf: deep link handler mimics native initsession now
ethanneff Mar 2, 2017
979a31e
0.0.0
ethanneff Mar 2, 2017
8fa9454
docs: update type=2 does not work
ethanneff Mar 2, 2017
f4ce3de
fix: removal of old uri scheme intends after removal of android:host
ethanneff Mar 2, 2017
092580a
feat: able to simulate installs on android
ethanneff Mar 2, 2017
55ed145
style: renamed ios-team params
ethanneff Mar 2, 2017
9f440ac
feat: added validation to <branch-config>
ethanneff Mar 2, 2017
da61e06
style: standardized error logging messages
ethanneff Mar 2, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions .eslintrc

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
testbed/platforms
testbed/plugins
testbed/hooks
testbed/build.json
node_modules
.installed
.gradle/
Expand All @@ -10,5 +11,5 @@ cordova-ionic-phonegap-branch-deep-linking.iml
local.properties
out/
src/cordova-ionic-phonegap-branch-deep-linking.iml
npm-debug.log
npm-debug.log*
*.map
40 changes: 0 additions & 40 deletions .jscsrc

This file was deleted.

119 changes: 102 additions & 17 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,117 @@
# Development Conventions
# Developing the SDK Locally
*Questions? [Contact us](https://support.branch.io/support/tickets/new)*

This document outlines our development processes.
1. [Dependencies](#dependencies)
1. [SDK](#sdk)
1. [Develop](#develop)
1. [Validate](#validate)
1. [Test](#test)
1. [Submit](#submit)

## ES6
#

Source code for all .js files in this project is written in es6 and then compiled via babel to es5. Unfortunately, for legacy reasons, the es5 needs to be stored in version control. As such, if you want to change a js file, edit the version in the corresponding .es6 directory, compile it with the `gulp babel` command, and then commit it as well as the resulting .js file.
### Dependencies

## Pull Requests
> Homebrew

All changes to this project should be made in the form of pull requests against master. Use snake-case prefixed by 'feat/' or 'fix/' for features/fixes. Feel free to use any of the commit types listed [here](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#type) as well. Note that when pull requests are merged in they will be automatically released to npm by (Travis CI)[https://travis-ci.org/] and (semantic-release)[https://github.com/semantic-release/semantic-release] so make sure to fully test.
```sh
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)";
brew update;
brew doctor;
export PATH="/usr/local/bin:$PATH";
```

> Node

## Commit Messages
```sh
brew install node;
```

Please format your commit messages to match [Angular's Conventions](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#-git-commit-guidelines). These messages are parsed using semantic release to determine version numbers so it is important that you stick to them exactly. We recommend using the `npm run commit` script installed in this project to draft conformant messages.
> Gulp

## Linting
```sh
npm install -g gulp-cli;
```

The style of all js files in this project are strictly checked using [jscs](http://jscs.info/) and [eslint](http://eslint.org/) before any pull request/release is made. You can manually check your local clone using the `gulp lint` command (don't forget to `npm install -g gulp` if you haven't already). Many problems can be automatically fixed by `gulp jscs-fix`. Don't forget to commit before running jscs-fix in case you end up needing to back out changes.
### SDK

## Testing
> Local

```sh
git clone git@github.com:BranchMetrics/cordova-ionic-phonegap-branch-deep-linking.git;
cd cordova-ionic-phonegap-branch-deep-linking;
rm -rf node_modules;
npm install --save-dev;
```

See [tests-harness/README.md](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/blob/master/tests-harness/README.md) for details on how to run this project's test suite. Please run the test suite before merging any branches.
### Develop

## Updating IOS dependencies
> Build

This project depends on [ios-branch-deep-linking](https://github.com/BranchMetrics/ios-branch-deep-linking). To upgrade that dependency a [release](https://github.com/BranchMetrics/ios-branch-deep-linking/releases) of it run the following script:
```sh
gulp prerelease;
```

> **[optional]** Update [iOS SDK](https://github.com/BranchMetrics/ios-branch-deep-linking/tags) (will need to update `plugin.xml` dependencies if new iOS files)

```sh
./src/ios/dependencies/update.sh 0.12.20;
```

### Test

> Modify `BRANCH_KEY` and `URI_SCHEME` and `config.xml` to values in [Branch Dashboard](https://dashboard.branch.io/settings/link)

```sh
gulp prerelease; cd testbed; npm install -g cordova; cordova platform remove ios; cordova platform remove android; cordova platform remove browser; cordova platform add ios; cordova platform add android; cordova plugin remove branch-cordova-sdk; cordova plugin add ../ --variable BRANCH_KEY=key_live_icCccJIpd7GlYY5oOmoEtpafuDiuyXhT --variable URI_SCHEME=enefftest;

gulp prod;
cd testbed;
npm uninstall mkpath node-version-compare plist xml2js;
rm -rf ../.installed;
rm -rf ./plugins;
rm -rf ./platforms;
cordova platform add ios;
cordova plugin add ../;
cordova build ios --developmentTeam="PW4Q8885U7";
open -a Xcode platforms/ios/Branch\ Testing.xcworkspace;

```

> Validate all features on both `iOS` and `Android` on `device` only (no `simulator` or `TestFlight`)

```shell
# <tag> is the name of the release. e,g, '0.12.5'
$ src/ios/dependencies/update.sh <tag>
```sh
cordova build ios --developmentTeam="PW4Q8885U7"; open -a Xcode platforms/ios/Branch\ Testing.xcworkspace;
```

```sh
cordova build android; cordova run android;
chrome://inspect/#devices
```

> Test harnesses `TODO`

### Submit

> **Required** [Semantic Release](https://github.com/semantic-release/semantic-release) comments `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `chore`, `revert`

> Submit code with a [pull request](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking)

```sh
git checkout -b BRANCH_NAME;
git add FILE_NAME;
npm run commit;
git push origin BRANCH_NAME;
```

### Publish

> Update `CHANGELOG.md`
> Update version within plugin.template.xml
> Run `gulp prerelease`
> Merge Pull Request - code to NPM will happen automatically


## Hooks

Don't need to `rebuild.sh`, just re-run `cordova build ios`
111 changes: 0 additions & 111 deletions DEVELOPING.md

This file was deleted.

5 changes: 0 additions & 5 deletions ISSUE_TEMPLATE

This file was deleted.

Loading