Require Nette 2.3

Kdyby · May 10, 2015 · 4c98739 · 4c98739
1 parent 5562b64
commit 4c98739
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,19 @@
 language: php
 
 env:
-  - NETTE=nette-2.3-dev
+  - NETTE=default
   - NETTE=nette-2.3
-  - NETTE=nette-2.2
 
 php:
-  - 5.3.3
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 matrix:
   allow_failures:
+    - php: 7.0
     - php: hhvm
 
 before_install:

diff --git a/composer.json b/composer.json
@@ -18,8 +18,8 @@
 		}
 	],
 	"require": {
-		"nette/di": "~2.2@dev",
-		"tracy/tracy": "~2.2@dev",
+		"nette/di": "~2.3@dev",
+		"tracy/tracy": "~2.3@dev",
 
 		"monolog/monolog": "~1.9"
 	},
@@ -62,7 +62,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.0-dev"
+			"dev-master": "1.1-dev"
 		}
 	}
 }