Require Nette 2.1 dev, alternative build is done agains 2.1 stable

Kdyby · May 25, 2014 · af634bb · af634bb
1 parent 0e9138a
commit af634bb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 69 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 language: php
 
 env:
+  - NETTE=default # 2.1 dev
   - NETTE=nette-2.1
-  - NETTE=default # 2.2
-  - NETTE=nette-dev
 
 php:
   - 5.3.3

diff --git a/composer.json b/composer.json
@@ -17,13 +17,13 @@
 		"issues": "https://github.com/kdyby/console/issues"
 	},
 	"require": {
-		"nette/nette": "~2.1@dev",
+		"nette/nette": "2.1.*@dev",
 
 		"symfony/console": "~2.4"
 	},
 	"require-dev": {
 		"nette/tester": "@dev",
-		"kdyby/events": "@dev",
+		"kdyby/events": "2.1.*@dev",
 		"symfony/event-dispatcher": "~2.4",
 		"jakub-onderka/php-parallel-lint": "~0.6"
 	},

diff --git a/tests/composer-nette-2.1.json b/tests/composer-nette-2.1.json
@@ -23,7 +23,7 @@
 	},
 	"require-dev": {
 		"nette/tester": "@dev",
-		"kdyby/events": "@dev",
+		"kdyby/events": "2.1.*@dev",
 		"symfony/event-dispatcher": "~2.4",
 		"jakub-onderka/php-parallel-lint": "~0.6"
 	},

diff --git a/tests/composer-nette-dev.json b/tests/composer-nette-dev.json