Skip to content

Commit 6d7e9c2

Browse files
authored
Merge pull request #401 from owncloud/fix/jwt-dependency
fix: use firebase/php-jwt from core
2 parents 46e4c7a + 6b18682 commit 6d7e9c2

File tree

4 files changed

+10
-71
lines changed

4 files changed

+10
-71
lines changed

.drone.star

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ config = {
7676
"suites": [
7777
"webUITextEditor",
7878
],
79+
"servers": [
80+
"daily-master-qa",
81+
],
7982
},
8083
"webUIActivity": {
8184
"suites": {

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<repository type="git">https://github.com/owncloud/files_texteditor.git</repository>
2323
<screenshot>https://raw.githubusercontent.com/owncloud/screenshots/a068ff44c439aa4969ea37b60e45bed875bbbb98/files_texteditor/texteditor.png</screenshot>
2424
<dependencies>
25-
<owncloud min-version="10.11" max-version="10" />
25+
<owncloud min-version="10.13" max-version="10" />
2626
<php min-version="7.4" />
2727
</dependencies>
2828
</info>

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"name": "owncloud/files_texteditor",
33
"config" : {
44
"platform": {
5-
"php": "7.3"
5+
"php": "7.4"
66
},
77
"allow-plugins": {
88
"bamarni/composer-bin-plugin": true
99
}
1010
},
11-
"require": {
12-
"firebase/php-jwt": "^6.0"
11+
"replace": {
12+
"firebase/php-jwt": "^6.8"
1313
},
1414
"require-dev": {
1515
"bamarni/composer-bin-plugin": "^1.8"

composer.lock

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

0 commit comments

Comments
 (0)