From f60af4eca7cc4871900be4f2a1b72f07c23ba98d Mon Sep 17 00:00:00 2001 From: Benjamin Brahmer Date: Mon, 27 Jan 2020 19:24:34 +0100 Subject: Update for Nextcloud 19 Signed-off-by: Benjamin Brahmer --- .travis.yml | 7 +++--- AUTHORS.md | 2 +- CHANGELOG.md | 2 +- appinfo/info.xml | 4 +-- composer.lock | 71 +++++++++++++++++++++++++++++++--------------------- js/package-lock.json | 32 +++++++++++------------ js/package.json | 2 +- 7 files changed, 67 insertions(+), 53 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8279d1830..09c8d7b18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ os: linux dist: bionic -sudo: false language: php php: @@ -12,7 +11,7 @@ env: global: - MOZ_HEADLESS=1 jobs: - - CORE_BRANCH=stable16 DB=mysql + - CORE_BRANCH=stable16 DB=pgsql - CORE_BRANCH=stable17 DB=mysql - CORE_BRANCH=stable18 DB=pgsql - CORE_BRANCH=stable18 DB=mysql @@ -22,7 +21,9 @@ env: jobs: exclude: - php: 7.4 - env: CORE_BRANCH=stable16 DB=mysql # not supported by nc + env: CORE_BRANCH=stable16 DB=pgsql # not supported by nc + - php: 7.4 + env: CORE_BRANCH=stable17 DB=pgsql # not supported by nc - php: 7.4 env: CORE_BRANCH=stable17 DB=mysql # not supported by nc - php: 7.2 diff --git a/AUTHORS.md b/AUTHORS.md index 0a73bd52d..1ddf896e9 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -2,8 +2,8 @@ * [Bernhard Posselt](mailto:dev@bernhard-posselt.com) * [Alessandro Cosentino](mailto:cosenal@gmail.com) * [Robin Appelman](mailto:icewind@owncloud.com) -* [Gregor Tätzner](mailto:gregor@freenet.de) * [Benjamin Brahmer](mailto:info@b-brahmer.de) +* [Gregor Tätzner](mailto:gregor@freenet.de) * [Morris Jobke](mailto:hey@morrisjobke.de) * [Sean Molenaar](mailto:SMillerDev@users.noreply.github.com) * [Jan-Christoph Borchardt](mailto:hey@jancborchardt.net) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c4a5dad3..d7743375b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. ## Unreleased - +- update for Nextcloud 19 ## 14.1.4-rc1 diff --git a/appinfo/info.xml b/appinfo/info.xml index 6042b6ab1..52b1a5b14 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -8,7 +8,7 @@ Before you update to a new version, [check the changelog](https://github.com/nextcloud/news/blob/master/CHANGELOG.md) to avoid surprises. **Important**: To enable feed updates you will need to enable either [Nextcloud system cron](https://docs.nextcloud.org/server/latest/admin_manual/configuration_server/background_jobs_configuration.html#cron) or use [an updater](https://github.com/nextcloud/news-updater) which uses the built in update API and disable cron updates. More information can be found [in the README](https://github.com/nextcloud/news).]]> - 14.1.4-rc1 + 14.1.4 agpl Benjamin Brahmer Sean Molenaar @@ -37,7 +37,7 @@ Before you update to a new version, [check the changelog](https://github.com/nex SimpleXML iconv - + diff --git a/composer.lock b/composer.lock index 56e11007b..92639aa62 100644 --- a/composer.lock +++ b/composer.lock @@ -111,16 +111,16 @@ }, { "name": "debril/feed-io", - "version": "v4.5.4", + "version": "v4.5.7", "source": { "type": "git", "url": "https://github.com/alexdebril/feed-io.git", - "reference": "7e5d3945a9b4f213f97882aaee931e6cadcadc8e" + "reference": "b5b2cef407404e4cbe6e06b937a81f5fb96c6024" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alexdebril/feed-io/zipball/7e5d3945a9b4f213f97882aaee931e6cadcadc8e", - "reference": "7e5d3945a9b4f213f97882aaee931e6cadcadc8e", + "url": "https://api.github.com/repos/alexdebril/feed-io/zipball/b5b2cef407404e4cbe6e06b937a81f5fb96c6024", + "reference": "b5b2cef407404e4cbe6e06b937a81f5fb96c6024", "shasum": "" }, "require": { @@ -167,7 +167,7 @@ "news", "rss" ], - "time": "2020-03-12T16:11:43+00:00" + "time": "2020-04-21T13:52:29+00:00" }, { "name": "ezyang/htmlpurifier", @@ -282,16 +282,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -325,7 +325,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "riimu/kit-pathjoin", @@ -1752,16 +1752,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.4", + "version": "3.5.5", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dceec07328401de6211037abbb18bda423677e26" + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", - "reference": "dceec07328401de6211037abbb18bda423677e26", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", "shasum": "" }, "require": { @@ -1799,20 +1799,20 @@ "phpcs", "standards" ], - "time": "2020-01-30T22:20:29+00:00" + "time": "2020-04-17T01:09:41+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.14.0", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38" + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "shasum": "" }, "require": { @@ -1824,7 +1824,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -1857,7 +1857,21 @@ "polyfill", "portable" ], - "time": "2020-01-13T11:15:53+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-02-27T09:26:54+00:00" }, { "name": "symfony/service-contracts", @@ -1959,16 +1973,16 @@ }, { "name": "webmozart/assert", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598" + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598", + "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6", + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "shasum": "" }, "require": { @@ -1976,7 +1990,7 @@ "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "vimeo/psalm": "<3.6.0" + "vimeo/psalm": "<3.9.1" }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" @@ -2003,7 +2017,7 @@ "check", "validate" ], - "time": "2020-02-14T12:15:55+00:00" + "time": "2020-04-18T12:12:48+00:00" } ], "aliases": [], @@ -2017,5 +2031,6 @@ "ext-simplexml": "*", "ext-libxml": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/js/package-lock.json b/js/package-lock.json index f6c6a50a9..de5b61789 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -3757,9 +3757,9 @@ "dev": true }, "jshint": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.3.tgz", - "integrity": "sha512-d8AoXcNNYzmm7cdmulQ3dQApbrPYArtVBO6n4xOICe4QsXGNHCAKDcFORzqP52LhK61KX0VhY39yYzCsNq+bxQ==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz", + "integrity": "sha512-ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==", "dev": true, "requires": { "cli": "~1.0.0", @@ -3770,20 +3770,6 @@ "minimatch": "~3.0.2", "shelljs": "0.3.x", "strip-json-comments": "1.0.x" - }, - "dependencies": { - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true - }, - "shelljs": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", - "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=", - "dev": true - } } }, "json-stable-stringify-without-jsonify": { @@ -4160,6 +4146,12 @@ } } }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + }, "lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", @@ -5433,6 +5425,12 @@ "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", "dev": true }, + "shelljs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", + "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=", + "dev": true + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", diff --git a/js/package.json b/js/package.json index 81ce6cea4..7cff43507 100644 --- a/js/package.json +++ b/js/package.json @@ -42,7 +42,7 @@ "gulp-terser": "^1.2.0", "jasmine-core": "^3.5.0", "jquery": "^3.4.1", - "jshint": "^2.10.3", + "jshint": "^2.11.0", "karma": "^4.4.1", "karma-chrome-launcher": "^3.1.0", "karma-coverage": "^2.0.1", -- cgit v1.2.3