Merge branch 'develop'

ncoden · ncoden · commit 1e0d9e6715eb · 2018-06-24T21:46:41.000+02:00
diff --git a/.versions b/.versions
@@ -0,0 +1,15 @@
+babel-compiler@5.8.24_1
+babel-runtime@0.1.4
+base64@1.0.4
+caching-compiler@1.0.0
+check@1.1.0
+ecmascript@0.1.6
+ecmascript-runtime@0.2.6
+ejson@1.0.7
+fourseven:scss@3.4.3
+jquery@1.11.4
+meteor@1.1.10
+promise@0.5.1
+random@1.0.5
+underscore@1.0.4
+zurb:motion-ui@2.0.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+# 2.0.3 (23 June 2018)
+
+This version makes Motion UI compatible with Meteor > 1.4.1 by allowing Meteor to use newer versions of the `fourseven:scss` dependency. Motion UI stays compatible with Meteor v1.2.1 and above.
+
+## 📄  Changes
+* 🐛  #125 - Revise Meteor `fourseven:scss` compatibility to support Meteor>1.4.1 support (@ncoden)
+
 # 2.0.2 (13 June 2018)
 
 This version fixes an issue introduced in `v2.0.1` preventing Meteor build and update Meteor installation documentation. It is fully compatible with `v2.0.1` and do not introduce any API change.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "motion-ui",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "authors": [
     "ZURB <foundation@zurb.com>"
   ],
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "zurb/motion-ui",
   "description": "Sass library for creating transitions and animations.",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "keywords": [
     "css",
     "sass",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.js b/package.js
@@ -1,15 +1,15 @@
 Package.describe({
   name: 'zurb:motion-ui',
-  version: '2.0.2',
+  version: '2.0.3',
   summary: 'Sass library for creating transitions and animations',
   git: 'https://github.com/zurb/motion-ui.git',
   documentation: 'meteor-README.md'
 });
 
 Package.onUse(function(api) {
   api.versionsFrom('1.2.1');
-  api.imply('fourseven:scss@3.4.1');
-  api.use(['ecmascript', 'jquery', 'fourseven:scss@3.4.1'], 'client');
+  api.imply('fourseven:scss@3.4.1 || 4.0.0');
+  api.use(['ecmascript', 'jquery', 'fourseven:scss@3.4.1 || 4.0.0'], 'client');
   api.addFiles('dist/motion-ui.js', 'client');
   api.addFiles([
     'src/_settings.scss',
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "motion-ui",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Sass library for creating transitions and animations.",
   "main": "dist/motion-ui.js",
   "scripts": {

-Original file line number
+Diff line change
 +[email protected]_1
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +fourseven:[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +zurb:[email protected]
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "motion-ui",`
`3`		`- "version": "2.0.2",`
	`3`	`+ "version": "2.0.3",`
`4`	`4`	`"authors": [`
`5`	`5`	`"ZURB <[email protected]>"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zurb/motion-ui",`
`3`	`3`	`"description": "Sass library for creating transitions and animations.",`
`4`		`- "version": "2.0.2",`
	`4`	`+ "version": "2.0.3",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"css",`
`7`	`7`	`"sass",`