lock to Nette 2.3

Kdyby · May 12, 2017 · cc9f021 · cc9f021
1 parent 80fa752
commit cc9f021
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,31 +11,22 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
 
 env:
   matrix:
-    - NETTE=nette-2.4-dev
-    - NETTE=nette-2.4
+    - NETTE=nette-2.3-dev
     - NETTE=nette-2.3
 
 matrix:
   include:
     - php: 5.6
       env: NETTE=nette-2.3 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
-    - php: 7.0
-      env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
-  exclude:
-    - php: 5.4
-      env: NETTE=nette-2.4-dev
-    - php: 5.4
-      env: NETTE=nette-2.4
-    - php: 5.5
-      env: NETTE=nette-2.4-dev
-    - php: 5.5
-      env: NETTE=nette-2.4
+    - php: 7.1
+      env: NETTE=nette-2.3 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
   allow_failures:
-    - php: 7.0
-      env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
+    - php: 7.1
+      env: NETTE=nette-2.3 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
 
 before_install:
   - travis_retry composer self-update
@@ -46,7 +37,7 @@ install:
   - travis_retry composer update --no-interaction --prefer-dist $COMPOSER_EXTRA_ARGS
   - travis_retry composer create-project --no-interaction jakub-onderka/php-parallel-lint /tmp/php-parallel-lint
   - travis_retry composer create-project --no-interaction kdyby/code-checker /tmp/code-checker
-  - travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
+  - if [ "$COVERAGE" != "" ]; then travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
 
 script:
   - vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/

diff --git a/composer.json b/composer.json
@@ -22,34 +22,34 @@
 		"issues": "https://github.com/kdyby/annotations/issues"
 	},
 	"require": {
-		"nette/di": "~2.3@dev",
-		"nette/utils": "~2.3@dev",
+		"nette/di": "2.3.*@dev",
+		"nette/utils": "2.3.*@dev",
 
 		"doctrine/annotations": "~1.2",
 		"kdyby/doctrine-cache": "~2.4@dev"
 	},
 	"require-dev": {
-		"nette/application": "~2.3@dev",
-		"nette/bootstrap": "~2.3@dev",
-		"nette/caching": "~2.3@dev",
-		"nette/component-model": "~2.2@dev",
-		"nette/database": "~2.3@dev",
-		"nette/deprecated": "~2.3@dev",
-		"nette/di": "~2.3@dev",
-		"nette/finder": "~2.3@dev",
-		"nette/forms": "~2.3@dev",
-		"nette/http": "~2.3@dev",
-		"nette/mail": "~2.3@dev",
-		"nette/neon": "~2.3@dev",
-		"nette/php-generator": "~2.3@dev",
-		"nette/reflection": "~2.3@dev",
-		"nette/robot-loader": "~2.3@dev",
-		"nette/safe-stream": "~2.3@dev",
-		"nette/security": "~2.3@dev",
-		"nette/tokenizer": "~2.2@dev",
-		"nette/utils": "~2.3@dev",
-		"latte/latte": "~2.3@dev",
-		"tracy/tracy": "~2.3@dev",
+		"nette/application": "2.3.*@dev",
+		"nette/bootstrap": "2.3.*@dev",
+		"nette/caching": "2.3.*@dev",
+		"nette/component-model": "~2.2@dev,<2.4",
+		"nette/database": "2.3.*@dev",
+		"nette/deprecated": "2.3.*@dev",
+		"nette/di": "2.3.*@dev",
+		"nette/finder": "2.3.*@dev",
+		"nette/forms": "2.3.*@dev",
+		"nette/http": "2.3.*@dev",
+		"nette/mail": "2.3.*@dev",
+		"nette/neon": "2.3.*@dev",
+		"nette/php-generator": "2.3.*@dev",
+		"nette/reflection": "2.3.*@dev",
+		"nette/robot-loader": "2.3.*@dev",
+		"nette/safe-stream": "2.3.*@dev",
+		"nette/security": "2.3.*@dev",
+		"nette/tokenizer": "~2.2@dev,<2.4",
+		"nette/utils": "2.3.*@dev",
+		"latte/latte": "2.3.*@dev",
+		"tracy/tracy": "2.3.*@dev",
 
 		"nette/tester": "~1.7"
 	},
@@ -63,7 +63,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.3-dev"
+			"dev-nette-2.3": "2.3-dev"
 		}
 	}
 }