summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Brahmer <info@b-brahmer.de>2023-08-11 10:48:41 +0200
committerBenjamin Brahmer <info@b-brahmer.de>2023-08-11 17:10:22 +0200
commite203e4bc1f38000afca13772530e7f9902a281a0 (patch)
treeb69ac57ec63d8bb89c572c1ef13cd620f6ba0073
parent449b2141f55d9e46d00d85503978be2b605c3a72 (diff)
drop support for Nextcloud 25dropSupport/NC25
Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
-rw-r--r--.github/workflows/api-integration-tests.yml2
-rw-r--r--.github/workflows/api-php-tests.yml4
-rw-r--r--CHANGELOG.md3
-rw-r--r--appinfo/info.xml4
-rw-r--r--lib/Service/StatusService.php8
5 files changed, 9 insertions, 12 deletions
diff --git a/.github/workflows/api-integration-tests.yml b/.github/workflows/api-integration-tests.yml
index 3387861a5..5434403ae 100644
--- a/.github/workflows/api-integration-tests.yml
+++ b/.github/workflows/api-integration-tests.yml
@@ -29,7 +29,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.0', '8.1']
- nextcloud: ['stable25', 'stable26', 'stable27']
+ nextcloud: ['stable26', 'stable27']
database: ['sqlite', 'pgsql', 'mysql']
experimental: [false]
include:
diff --git a/.github/workflows/api-php-tests.yml b/.github/workflows/api-php-tests.yml
index dae893f22..9dbb20d8f 100644
--- a/.github/workflows/api-php-tests.yml
+++ b/.github/workflows/api-php-tests.yml
@@ -15,8 +15,8 @@ jobs:
experimental: [false]
codecoverage: [false]
include:
- - php-versions: 8.0
- nextcloud: stable25
+ - php-versions: 8.2
+ nextcloud: stable27
database: sqlite
experimental: false
codecoverage: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fb6bda61..eee7d403d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,9 @@ All notable changes to this project will be documented in this file.
The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), older entries don't fully match.
# Unreleased
-## [23.x.x]
+## [24.x.x]
### Changed
+- Drop support for Nextcloud 25, Supported: 26, 27
### Fixed
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 3d3e90e9f..8e264a5ee 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -21,7 +21,7 @@ Create a [feature request](https://github.com/nextcloud/news/discussions/new)
Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
]]></description>
- <version>23.0.0-beta1</version>
+ <version>24.0.0</version>
<licence>agpl</licence>
<author>Benjamin Brahmer</author>
<author>Sean Molenaar</author>
@@ -55,7 +55,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
<lib>json</lib>
<owncloud max-version="0" min-version="0"/>
- <nextcloud min-version="25" max-version="27"/>
+ <nextcloud min-version="26" max-version="27"/>
</dependencies>
<background-jobs>
diff --git a/lib/Service/StatusService.php b/lib/Service/StatusService.php
index 69a621e3c..09cea9e4a 100644
--- a/lib/Service/StatusService.php
+++ b/lib/Service/StatusService.php
@@ -92,12 +92,8 @@ class StatusService
$time = 0;
- [$major, $minor, $micro] = Util::getVersion();
-
- if ($major >= 26) {
- $myJobList = $this->jobList->getJobsIterator(UpdaterJob::class, 1, 0);
- $time = $myJobList->current()->getLastRun();
- }
+ $myJobList = $this->jobList->getJobsIterator(UpdaterJob::class, 1, 0);
+ $time = $myJobList->current()->getLastRun();
return $time;
}