Drop support for Ember 2.12

.travis.yml

@@ -22,7 +22,6 @@ env:
   matrix:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - EMBER_TRY_SCENARIO=ember-lts-2.12
     - EMBER_TRY_SCENARIO=ember-lts-2.16
     - EMBER_TRY_SCENARIO=ember-lts-2.18
     - EMBER_TRY_SCENARIO=ember-release

README.md

@@ -15,7 +15,7 @@
   </a>
 </p>
 
-Ember Custom Actions is a package for defining custom API actions, dedicated for Ember 2.8 (and higher) applications.
+Ember Custom Actions is a package for defining custom API actions, dedicated for Ember 2.16 (and higher) applications.
 
 # Getting started
 

addon/actions/action.js

@@ -10,7 +10,7 @@ import EmberObject, { computed } from '@ember/object';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 
 import { reject } from 'rsvp';
-import deepMerge from 'lodash/merge';
+import deepMerge from 'lodash.merge';
 import normalizePayload from 'ember-custom-actions/utils/normalize-payload';
 import urlBuilder from 'ember-custom-actions/utils/url-builder';
 

addon/actions/custom.js

@@ -1,5 +1,5 @@
 import Action from 'ember-custom-actions/actions/action';
-import deepMerge from 'lodash/merge';
+import deepMerge from 'lodash.merge';
 
 export default function(id, options = {}) {
   return function(payload = {}, actionOptions = {}) {

addon/actions/model.js

@@ -1,5 +1,5 @@
 import Action from 'ember-custom-actions/actions/action';
-import deepMerge from 'lodash/merge';
+import deepMerge from 'lodash.merge';
 
 export default function(path, options = {}) {
   return function(payload = {}, actionOptions = {}) {

addon/actions/resource.js

@@ -1,5 +1,5 @@
 import Action from 'ember-custom-actions/actions/action';
-import deepMerge from 'lodash/merge';
+import deepMerge from 'lodash.merge';
 
 export default function(path, options = {}) {
   return function(payload = {}, actionOptions = {}) {

index.js

@@ -1,5 +1,17 @@
 'use strict';
 
 module.exports = {
-  name: 'ember-custom-actions'
+  name: 'ember-custom-actions',
+
+  importTransforms: require('ember-cli-cjs-transform').importTransforms,
+
+  included() {
+    this._super.included.apply(this, arguments);
+
+    this.import('node_modules/lodash.merge/index.js', {
+      using: [
+        { transformation: 'cjs', as: 'lodash.merge' }
+      ]
+    });
+  },
 };