Skip to content

Commit 74ccef1

Browse files
Merge remote-tracking branch 'upstream/master'
2 parents ec6af56 + 92243cd commit 74ccef1

29 files changed

+3763
-1425
lines changed

.appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ install:
2121
- node --version
2222
- npm install -g cordova-paramedic@https://github.com/apache/cordova-paramedic.git
2323
- npm install -g cordova
24+
- npm install
2425

2526
build: off
2627

2728
test_script:
29+
- npm run eslint
2830
- cordova-paramedic --config pr\%PLATFORM% --plugin . %JUST_BUILD%

.github/ISSUE_TEMPLATE.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!--
2+
Please have a look at the issue templates you get when you click "New issue" in the GitHub UI.
3+
We very much prefer issues created by using one of these templates.
4+
-->
5+
6+
### Issue Type
7+
<!-- Please check the boxes by putting an x in the [ ] like so: [x] -->
8+
9+
- [ ] Bug Report
10+
- [ ] Feature Request
11+
- [ ] Support Question
12+
13+
## Description
14+
15+
## Information
16+
<!-- Include all relevant information that might help understand and reproduce the problem -->
17+
18+
### Command or Code
19+
<!-- What command or code is needed to reproduce the problem? -->
20+
21+
### Environment, Platform, Device
22+
<!-- In what environment, on what platform or on which device are you experiencing the issue? -->
23+
24+
25+
26+
### Version information
27+
<!--
28+
What are relevant versions you are using?
29+
For example:
30+
Cordova: Cordova CLI, Cordova Platforms, Cordova Plugins
31+
Other Frameworks: Ionic Framework and CLI version
32+
Operating System, Android Studio, Xcode etc.
33+
-->
34+
35+
36+
37+
## Checklist
38+
<!-- Please check the boxes by putting an `x` in the `[ ]` like so: `[x]` -->
39+
40+
- [ ] I searched for already existing GitHub issues about this
41+
- [ ] I updated all Cordova tooling to their most recent version
42+
- [ ] I included all the necessary information above

.github/ISSUE_TEMPLATE/BUG_REPORT.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
name: 🐛 Bug Report
3+
about: If something isn't working as expected.
4+
5+
---
6+
7+
# Bug Report
8+
9+
## Problem
10+
11+
### What is expected to happen?
12+
13+
14+
15+
### What does actually happen?
16+
17+
18+
19+
## Information
20+
<!-- Include all relevant information that might help understand and reproduce the problem -->
21+
22+
23+
24+
### Command or Code
25+
<!-- What command or code is needed to reproduce the problem? -->
26+
27+
28+
29+
### Environment, Platform, Device
30+
<!-- In what environment, on what platform or on which device are you experiencing the issue? -->
31+
32+
33+
34+
### Version information
35+
<!--
36+
What are relevant versions you are using?
37+
For example:
38+
Cordova: Cordova CLI, Cordova Platforms, Cordova Plugins
39+
Other Frameworks: Ionic Framework and CLI version
40+
Operating System, Android Studio, Xcode etc.
41+
-->
42+
43+
44+
45+
## Checklist
46+
<!-- Please check the boxes by putting an x in the [ ] like so: [x] -->
47+
48+
- [ ] I searched for existing GitHub issues
49+
- [ ] I updated all Cordova tooling to most recent version
50+
- [ ] I included all the necessary information above
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
name: 🚀 Feature Request
3+
about: A suggestion for a new functionality
4+
5+
---
6+
7+
# Feature Request
8+
9+
## Motivation Behind Feature
10+
<!-- Why should this feature be implemented? What problem does it solve? -->
11+
12+
13+
14+
## Feature Description
15+
<!--
16+
Describe your feature request in detail
17+
Please provide any code examples or screenshots of what this feature would look like
18+
Are there any drawbacks? Will this break anything for existing users?
19+
-->
20+
21+
22+
23+
## Alternatives or Workarounds
24+
<!--
25+
Describe alternatives or workarounds you are currently using
26+
Are there ways to do this with existing functionality?
27+
-->
28+
29+
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
name: 💬 Support Question
3+
about: If you have a question, please check out our Slack or StackOverflow!
4+
5+
---
6+
7+
<!------------^ Click "Preview" for a nicer view! -->
8+
9+
Apache Cordova uses GitHub Issues as a feature request and bug tracker _only_.
10+
For usage and support questions, please check out the resources below. Thanks!
11+
12+
---
13+
14+
You can get answers to your usage and support questions about **Apache Cordova** on:
15+
16+
* Slack Community Chat: https://cordova.slack.com (you can sign-up at http://slack.cordova.io/)
17+
* StackOverflow: https://stackoverflow.com/questions/tagged/cordova using the tag `cordova`
18+
19+
---
20+
21+
If you are using a tool that uses Cordova internally, like e.g. Ionic, check their support channels:
22+
23+
* **Ionic Framework**
24+
* [Ionic Community Forum](https://forum.ionicframework.com/)
25+
* [Ionic Worldwide Slack](https://ionicworldwide.herokuapp.com/)
26+
* **PhoneGap**
27+
* [PhoneGap Developer Community](https://forums.adobe.com/community/phonegap)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!--
2-
Please make sure the checklist boxes are all checked before submitting the PR. The checklist
3-
is intended as a quick reference, for complete details please see our Contributor Guidelines:
2+
Please make sure the checklist boxes are all checked before submitting the PR. The checklist is intended as a quick reference, for complete details please see our Contributor Guidelines:
43
54
http://cordova.apache.org/contribute/contribute_guidelines.html
65
@@ -10,13 +9,27 @@ Thanks!
109
### Platforms affected
1110

1211

13-
### What does this PR do?
1412

13+
### Motivation and Context
14+
<!-- Why is this change required? What problem does it solve? -->
15+
<!-- If it fixes an open issue, please link to the issue here. -->
16+
17+
18+
19+
### Description
20+
<!-- Describe your changes in detail -->
21+
22+
23+
24+
### Testing
25+
<!-- Please describe in detail how you tested your changes. -->
1526

16-
### What testing has been done on this change?
1727

1828

1929
### Checklist
20-
- [ ] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database
21-
- [ ] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.
22-
- [ ] Added automated test coverage as appropriate for this change.
30+
31+
- [ ] I've run the tests to see all new and existing tests pass
32+
- [ ] I added automated test coverage as appropriate for this change
33+
- [ ] Commit is prefixed with `(platform)` if this change only applies to one platform (e.g. `(android)`)
34+
- [ ] If this Pull Request resolves an issue, I linked to the issue in the text above (and used the correct [keyword to close issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/))
35+
- [ ] I've updated the documentation if necessary

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Thumbs.db
1111
*.log
1212
*.swp
1313
*.user
14+
*.idea
1415

1516
node_modules
1617

.travis.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
sudo: false
2+
23
addons:
34
jwt:
45
secure: TZ88IEvAw1bsWPWxvDzXdpi2NK0i3PN4hG15+vDpIt6wXGVPknjxuXWJeLj7TqBpAIvP7XDfS8ZvHVPLe7fe8oOchZPLuiDw9VVIk6cnHjE6wpoavdGc/1mDJ3Bi4PDcHwRUr5ng5spYQqqlTwcECkH/q7iPgudiFM6rlOlGRyA=
6+
57
env:
68
global:
79
- SAUCE_USERNAME=snay
810
- TRAVIS_NODE_VERSION="4.2"
11+
912
matrix:
1013
include:
1114
- env: PLATFORM=browser-chrome
@@ -24,14 +27,15 @@ matrix:
2427
os: linux
2528
language: node_js
2629
node_js: '4.2'
27-
- env: PLATFORM=ios-9.3
28-
os: osx
29-
osx_image: xcode7.3
30-
language: node_js
31-
node_js: '4.2'
30+
# iOS 9 not supported by iOS WKWebView implementation
31+
# - env: PLATFORM=ios-9.3
32+
# os: osx
33+
# osx_image: xcode8.3
34+
# language: node_js
35+
# node_js: '4.2'
3236
- env: PLATFORM=ios-10.0
3337
os: osx
34-
osx_image: xcode7.3
38+
osx_image: xcode8.3
3539
language: node_js
3640
node_js: '4.2'
3741
- env: PLATFORM=android-4.4
@@ -74,20 +78,23 @@ matrix:
7478
- platform-tools
7579
- tools
7680
- build-tools-26.0.2
81+
7782
before_install:
7883
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm
7984
&& git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm
8085
install $TRAVIS_NODE_VERSION
8186
- node --version
8287
- if [[ "$PLATFORM" =~ android ]]; then gradle --version; fi
8388
- if [[ "$PLATFORM" =~ ios ]]; then npm install -g ios-deploy; fi
84-
- if [[ "$PLATFORM" =~ android ]]; then echo y | android update sdk -u --filter android-22,android-23,android-24,android-25,android-26;
89+
- if [[ "$PLATFORM" =~ android ]]; then echo y | android update sdk -u --filter android-22,android-23,android-24,android-25,android-26,android-27;
8590
fi
8691
- git clone https://github.com/apache/cordova-paramedic /tmp/paramedic && pushd /tmp/paramedic
8792
&& npm install && popd
8893
- npm install -g cordova
94+
8995
install:
9096
- npm install
97+
9198
script:
9299
- npm test
93100
- node /tmp/paramedic/main.js --config pr/$PLATFORM --plugin $(pwd) --shouldUseSauce

0 commit comments

Comments
 (0)