Skip to content

Commit 4f88a02

Browse files
committed
Merge RP #11 from zonky2
2 parents 41efb2c + 7a589aa commit 4f88a02

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
language: php
22

33
php:
4-
- "5.4"
5-
- "5.5"
6-
- "5.6"
7-
- "7.0"
4+
- "7.2"
85
- "7.1"
6+
- "7.0"
7+
- "5.6"
98

109
env:
1110
- CONTAO_VERSION=~3.5.5
1211

1312
sudo: false
1413

14+
before_install:
15+
- echo "memory_limit = -1" > travis.php.ini && phpenv config-add travis.php.ini
16+
1517
install:
1618
- travis_retry composer self-update && composer --version
1719
- travis_retry composer require contao/core $CONTAO_VERSION --no-update

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"type": "contao-module",
1111
"homepage": "http://now.metamodel.me/",
12-
"license": "LGPL-3.0+",
12+
"license": "LGPL-3.0-or-later",
1313
"authors": [
1414
{
1515
"name": "Christian Schiffler",
@@ -31,10 +31,11 @@
3131
"source": "https://github.com/MetaModels/filter_checkbox"
3232
},
3333
"require": {
34-
"php": ">=5.4",
34+
"php": "^5.6 || ^7.0",
3535
"contao/core": "^3.5.5",
3636
"contao-community-alliance/composer-plugin": "~2.0",
37-
"metamodels/core": "~2.0"
37+
"contao-community-alliance/dc-general": "~2.0@beta",
38+
"metamodels/core": "~2.0@alpha"
3839
},
3940
"require-dev": {
4041
"cyberspectrum/contao-toolbox": "~0.6",
@@ -61,7 +62,5 @@
6162
"dev-master": "2.0.x-dev",
6263
"dev-develop": "2.1.x-dev"
6364
}
64-
},
65-
"minimum-stability": "dev",
66-
"prefer-stable": true
65+
}
6766
}

0 commit comments

Comments
 (0)