Update supported versions to 1.13+

pouchdb-community · Dec 5, 2015 · 60e086e · 60e086e
1 parent b943553
commit 60e086e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,11 +10,10 @@ cache:
     - node_modules
 
 env:
-  - EMBER_TRY_SCENARIO=ember-data-beta.15
-  - EMBER_TRY_SCENARIO=ember-data-beta.16
-  - EMBER_TRY_SCENARIO=ember-data-beta.18
-  - EMBER_TRY_SCENARIO=ember-data-beta.19
   - EMBER_TRY_SCENARIO=ember-data-1.13
+  - EMBER_TRY_SCENARIO=ember-data-2.0
+  - EMBER_TRY_SCENARIO=ember-data-2.1
+  - EMBER_TRY_SCENARIO=ember-data-2.2
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary

diff --git a/bower.json b/bower.json
@@ -22,10 +22,10 @@
     "tests"
   ],
   "dependencies": {
-    "ember": "^1.10.0",
+    "ember": "~1.13.0 || 2.x",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "~1.13.0",
+    "ember-data": "~1.13.0 || 2.x",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
     "ember-qunit": "0.3.3",
     "ember-qunit-notifications": "0.0.7",

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,59 +1,50 @@
 module.exports = {
   scenarios: [
     {
-      name: 'ember-data-beta.15',
-      dependencies: {
-        'ember': '1.10.0',
-        'ember-data': '1.0.0-beta.15'
-      },
-      resolutions: {
-        'ember': '1.10.0'
-      }
-    },
-    {
-      name: 'ember-data-beta.16',
+      name: 'ember-data-1.13',
       dependencies: {
-        'ember': '1.10.0',
-        'ember-data': '1.0.0-beta.16.1'
+        'ember': '1.13.11',
+        'ember-data': '1.13.15'
       },
       resolutions: {
-        'ember': '1.10.0'
+        'ember': '1.13.11'
       }
     },
     {
-      name: 'ember-data-beta.18',
+      name: 'ember-data-2.0',
       dependencies: {
-        'ember': '1.12.1',
-        'ember-data': '1.0.0-beta.18'
+        'ember': '2.0.2',
+        'ember-data': '2.0.1'
       },
       resolutions: {
-        'ember': '1.12.1'
+        'ember': '2.0.2'
       }
     },
     {
-      name: 'ember-data-beta.19',
+      name: 'ember-data-2.1',
       dependencies: {
-        'ember': '1.13.2',
-        'ember-data': '1.0.0-beta.19.2'
+        'ember': '2.1.1',
+        'ember-data': '2.1.0'
       },
       resolutions: {
-        'ember': '1.13.2'
+        'ember': '2.1.1'
       }
     },
     {
-      name: 'ember-data-1.13',
+      name: 'ember-data-2.2',
       dependencies: {
-        'ember': '1.13.2',
-        'ember-data': '1.13.2'
+        'ember': '2.2.0',
+        'ember-data': '2.2.1'
       },
       resolutions: {
-        'ember': '1.13.2'
+        'ember': '2.2.0'
       }
     },
     {
       name: 'ember-release',
       dependencies: {
-        'ember': 'components/ember#release'
+        'ember': 'components/ember#release',
+        'ember-data': 'components/ember-data#release'
       },
       resolutions: {
         'ember': 'release'
@@ -62,7 +53,8 @@ module.exports = {
     {
       name: 'ember-beta',
       dependencies: {
-        'ember': 'components/ember#beta'
+        'ember': 'components/ember#beta',
+        'ember-data': 'components/ember-data#beta'
       },
       resolutions: {
         'ember': 'beta'
@@ -71,7 +63,8 @@ module.exports = {
     {
       name: 'ember-canary',
       dependencies: {
-        'ember': 'components/ember#canary'
+        'ember': 'components/ember#canary',
+        'ember-data': 'components/ember-data#canary'
       },
       resolutions: {
         'ember': 'canary'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-pouch",
-  "version": "2.0.3",
+  "version": "3.0.0",
   "description": "PouchDB adapter for Ember Data",
   "directories": {
     "doc": "doc",
@@ -42,7 +42,7 @@
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.3.13",
     "ember-cli-uglify": "^1.0.1",
-    "ember-data": "~1.0.0-beta.12",
+    "ember-data": "~1.13.0 || 2.x",
     "ember-disable-proxy-controllers": "^0.7.0",
     "ember-export-application-global": "^1.0.2",
     "ember-disable-prototype-extensions": "^1.0.0",