Skip to content

Commit ee3200b

Browse files
author
MTier Ltd
committed
default to php 8.1
1 parent a5d245f commit ee3200b

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ appstore_build_directory=$(CURDIR)/build/artifacts/appstore
4747
appstore_package_name=$(appstore_build_directory)/$(app_name)
4848
npm=$(shell which npm 2> /dev/null)
4949
composer=$(shell which composer 2> /dev/null)
50-
php=$(shell which php-8.0 2> /dev/null) -dallow_url_fopen=On
50+
php=$(shell which php-8.1 2> /dev/null) -dallow_url_fopen=On
51+
52+
COMPOSER_ARGS=--prefer-dist --no-dev
5153

5254
all: build
5355

@@ -75,11 +77,11 @@ ifeq (, $(composer))
7577
mkdir -p $(build_tools_directory)
7678
curl -sS https://getcomposer.org/installer | $(php)
7779
mv composer.phar $(build_tools_directory)
78-
$(php) $(build_tools_directory)/composer.phar install --prefer-dist
79-
$(php) $(build_tools_directory)/composer.phar update --prefer-dist
80+
$(php) $(build_tools_directory)/composer.phar install $(COMPOSER_ARGS)
81+
$(php) $(build_tools_directory)/composer.phar update $(COMPOSER_ARGS)
8082
else
81-
composer install --prefer-dist
82-
composer update --prefer-dist
83+
composer install $(COMPOSER_ARGS)
84+
composer update $(COMPOSER_ARGS)
8385
endif
8486

8587
# Installs npm dependencies

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
],
1111
"require": {},
1212
"require-dev": {
13-
"christophwurst/nextcloud": "^23.0"
13+
"christophwurst/nextcloud": "^24.0"
1414
}
1515
}

composer.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)