Merge v2.0.x into master (#1736)

* Added partial Android FCM support (#975) * Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines * Fixed empty token on android first run (#1008) * Removed GCM files and added FCM files * Added .framework files as custom frameworks * Changed code to work with FCM * Added hook and resource file to copy GoogleService-Info.plist * fixed registration and removed unused code * Use CocoaPods * Fix rebase errors * Fix topic subscription and unsubscription on FCM * Refactor GCMIntentService to FCMService * Issue #689: Remove sender id from PushNotification init Android options * Issue #689: Remove sender id from PushNotification init iOS options * 📝 Update to using fcm-node * 🐛 Issue #1188: Strings.xml google_app_id conflict with google-services.json * Add empty google services plist * Pin FCM to 9.8.0 * 🔧 Add browser platform back for FCM branch * 🔨🔧⬆️ Use Babel to transpile ES2015 code * 🔧 add tern to gitignore * 🔖 Bumping plugin version to 2.0.0-rc1 * 2.0.0-rc1 * Updating CHANGELOG * Fixing my merge error for PR #1378 Optional event emit instead of function call for action buttons * 🐛🍎 Issue #1461: App crashes when initialising with topics (v2.0.0-rc1) * 🐛🐧📝⬆️ #1460: Build Issue Android * 🐛🍎🔧 Fixing a merge issue where aps-environment was accidentally removed * 🐧📝🐛 Issue #1470: Cannot install phonegap-plugin-push on master * 📝 Using a newer version on the examples * 🍎🐛 Issue #1497: App crashes after refreshing when using FCM (v2) * Bumping plugin version to 2.0.0-rc2 * 2.0.0-rc2 * Updating CHANGELOG * Added partial Android FCM support (#975) * Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines * Removed GCM files and added FCM files * Changed code to work with FCM * Added hook and resource file to copy GoogleService-Info.plist * Use CocoaPods * Fix rebase errors * Issue #689: Remove sender id from PushNotification init Android options * 🐛 Issue #1188: Strings.xml google_app_id conflict with google-services.json * Pin FCM to 9.8.0 * 🔧 Add browser platform back for FCM branch * 🔨🔧⬆️ Use Babel to transpile ES2015 code * 🔧 add tern to gitignore * 🔖 Bumping plugin version to 2.0.0-rc1 * 🐛🐧📝⬆️ #1460: Build Issue Android * Bumping plugin version to 2.0.0-rc2 * Added partial Android FCM support (#975) * Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines * Removed GCM files and added FCM files * Added hook and resource file to copy GoogleService-Info.plist * Use CocoaPods * Fix rebase errors * 🐛 Issue #1188: Strings.xml google_app_id conflict with google-services.json * Updating CHANGELOG * ✏️ fixing error in CHANGELOG * Bumping plugin version to 2.0.0-rc2 * Updating CHANGELOG * Added partial Android FCM support (#975) * Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines * Removed GCM files and added FCM files * Changed code to work with FCM * Added hook and resource file to copy GoogleService-Info.plist * fixed registration and removed unused code * Use CocoaPods * Fix rebase errors * Issue #689: Remove sender id from PushNotification init Android options * Issue #689: Remove sender id from PushNotification init iOS options * 🐛 Issue #1188: Strings.xml google_app_id conflict with google-services.json * 🔧 add tern to gitignore * 🔖 Bumping plugin version to 2.0.0-rc1 * Bumping plugin version to 2.0.0-rc2 * Remove hook and use resource-file tag to copy google services file * Add resource-file way of copying google services files * Bump requirements * 🔧 Update cordovaDependencies * 🔖 Bumping plugin version to 2.0.0-rc3 * 2.0.0-rc3 * Updating CHANGELOG * Fixes 'framework not found GoogleToolboxForMac' linker error in 2.0.0-rc3 (#1715) * Remove unused files (#1732) * Remove GTM framework. (#1739)
phonegap · May 25, 2017 · d07fdf0 · d07fdf0
1 parent 525816c
commit d07fdf0
Show file tree

Hide file tree

Showing 27 changed files with 1,732 additions and 887 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,18 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    ["add-header-comment", {
+      "files": {
+        "src/js/push.js": {
+          "header": [
+            "This file has been generated by Babel.\n",
+            "DO NOT EDIT IT DIRECTLY\n",
+            "Edit the JS source file src/js/push.js"
+          ]
+        }
+      }
+    }]
+  ]
+}
diff --git a/.editorconfig b/.editorconfig
@@ -6,7 +6,7 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 4
+indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true

diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,17 @@
+{
+  "extends": "airbnb",
+  "parser": "babel-eslint",
+  "ecmaFeatures": {
+    "experimentalObjectRestSpread": true
+  },
+  "rules": {
+    "spaced-comment": 0,
+    "no-console": 0,
+    "no-unused-expressions": [2, { "allowShortCircuit": true }]
+  },
+  "env": {
+      "node": true,
+      "mocha": true,
+      "browser": true
+  }
+}
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -41,33 +41,33 @@ git commit -m "Cool stuff"
 ```
 
 Consider starting the commit message with an applicable emoji:
-    * :art: `:art:` when improving the format/structure of the code
-    * :zap: `:zap:` when improving performance
-    * :non-potable_water: `:non-potable_water:` when plugging memory leaks
-    * :memo: `:memo:` when writing docs
-    * :ambulance: `:ambulance:` a critical hotfix.
-    * :sparkles: `:sparkles:` when introducing new features
-    * :bookmark: `:bookmark:` when releasing / version tags
-    * :rocket: `:rocket:` when deploying stuff
-    * :penguin: `:penguin:` when fixing something on Android
-    * :apple: `:apple:` when fixing something on iOS
-    * :checkered_flag: `:checkered_flag:` when fixing something on Windows
-    * :bug: `:bug:` when fixing a bug
-    * :fire: `:fire:` when removing code or files
-    * :green_heart: `:green_heart:` when fixing the CI build
-    * :white_check_mark: `:white_check_mark:` when adding tests
-    * :lock: `:lock:` when dealing with security
-    * :arrow_up: `:arrow_up:` when upgrading dependencies
-    * :arrow_down: `:arrow_down:` when downgrading dependencies
-    * :shirt: `:shirt:` when removing linter warnings
-    * :hammer: `:hammer:` when doing heavy refactoring
-    * :heavy_minus_sign: `:heavy_minus_sign:` when removing a dependency.
-    * :heavy_plus_sign: `:heavy_plus_sign:` when adding a dependency.
-    * :wrench: `:wrench:` when changing configuration files.
-    * :globe_with_meridians: `:globe_with_meridians:` when dealing with internationalization and localization.
-    * :pencil2: `:pencil2:` when fixing typos.
-    * :hankey: `:hankey:` when writing bad code that needs to be improved.
-    * :package: `:package:` when updating compiled files or packages.
+* :art: `:art:` when improving the format/structure of the code
+* :zap: `:zap:` when improving performance
+* :non-potable_water: `:non-potable_water:` when plugging memory leaks
+* :memo: `:memo:` when writing docs
+* :ambulance: `:ambulance:` a critical hotfix.
+* :sparkles: `:sparkles:` when introducing new features
+* :bookmark: `:bookmark:` when releasing / version tags
+* :rocket: `:rocket:` when deploying stuff
+* :penguin: `:penguin:` when fixing something on Android
+* :apple: `:apple:` when fixing something on iOS
+* :checkered_flag: `:checkered_flag:` when fixing something on Windows
+* :bug: `:bug:` when fixing a bug
+* :fire: `:fire:` when removing code or files
+* :green_heart: `:green_heart:` when fixing the CI build
+* :white_check_mark: `:white_check_mark:` when adding tests
+* :lock: `:lock:` when dealing with security
+* :arrow_up: `:arrow_up:` when upgrading dependencies
+* :arrow_down: `:arrow_down:` when downgrading dependencies
+* :shirt: `:shirt:` when removing linter warnings
+* :hammer: `:hammer:` when doing heavy refactoring
+* :heavy_minus_sign: `:heavy_minus_sign:` when removing a dependency.
+* :heavy_plus_sign: `:heavy_plus_sign:` when adding a dependency.
+* :wrench: `:wrench:` when changing configuration files.
+* :globe_with_meridians: `:globe_with_meridians:` when dealing with internationalization and localization.
+* :pencil2: `:pencil2:` when fixing typos.
+* :hankey: `:hankey:` when writing bad code that needs to be improved.
+* :package: `:package:` when updating compiled files or packages.
 
 Make sure your branch is up to date with the original repo:
 
@@ -100,23 +100,8 @@ The project uses [.editorconfig](http://editorconfig.org/) to define the coding
 style of each file. We recommend that you install the Editor Config extension
 for your preferred IDE. Consistency is key.
 
-## JSHint
+## ESLint
 
-The project uses [.jshint](http://jshint.com/docs) to define the JavaScript
-coding conventions. Most editors now have a JSHint add-on to provide on-save
+The project uses [.eslint](http://eslint.org/) to define the JavaScript
+coding conventions. Most editors now have a ESLint add-on to provide on-save
 or on-edit linting.
-
-### Install JSHint for vim
-
-1. Install [jshint](https://www.npmjs.com/package/jshint).
-1. Install [jshint.vim](https://github.com/wookiehangover/jshint.vim).
-
-### Install JSHint for Sublime
-
-1. Install [Package Control](https://packagecontrol.io/installation)
-1. Restart Sublime
-1. Type `CMD+SHIFT+P`
-1. Type _Install Package_
-1. Type _JSHint Gutter_
-1. Sublime -> Preferences -> Package Settings -> JSHint Gutter
-1. Set `lint_on_load` and `lint_on_save` to `true`
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 .DS_Store
 /node_modules/
 npm-debug.log
+.tern-project
diff --git a/.jshintrc b/.jshintrc