drop support of Nextcloud 27 (#322)

Dropping Nextcloud 27 support. --------- Signed-off-by: Andrey Borysenko <[email protected]> Signed-off-by: Alexander Piskun <[email protected]> Co-authored-by: Alexander Piskun <[email protected]>
nextcloud · Jul 10, 2024 · ca4c14c · ca4c14c
1 parent 1e71efd
commit ca4c14c
Show file tree

Hide file tree

Showing 10 changed files with 188 additions and 255 deletions.
diff --git a/.github/workflows/tests-deploy.yml b/.github/workflows/tests-deploy.yml
@@ -21,9 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version: [ '8.1' ]
-        server-version: [ 'stable27' ]
+        server-version: [ 'stable28' ]
         include:
-          - server-version: "stable28"
+          - server-version: "stable29"
             php-version: "8.2"
           - server-version: "master"
             php-version: "8.3"
@@ -402,7 +402,7 @@ jobs:
 
   nc-host-app-docker-redis:
     runs-on: ubuntu-22.04
-    name: NC In Host(Redis) • stable27 • 🐘8.1
+    name: NC In Host(Redis) • stable28 • 🐘8.1
 
     services:
       postgres:
@@ -434,7 +434,7 @@ jobs:
         with:
           submodules: true
           repository: nextcloud/server
-          ref: stable27
+          ref: stable28
 
       - name: Checkout AppAPI
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -520,23 +520,23 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: nc_host_app_docker_redis_stable27_8.1_container.json
+          name: nc_host_app_docker_redis_stable28_8.1_container.json
           path: container.json
           if-no-files-found: warn
 
       - name: Upload Container logs
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: nc_host_app_docker_redis_stable27_8.1_container.log
+          name: nc_host_app_docker_redis_stable28_8.1_container.log
           path: container.log
           if-no-files-found: warn
 
       - name: Upload NC logs
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: nc_host_app_docker_redis_stable27_8.1_nextcloud.log
+          name: nc_host_app_docker_redis_stable28_8.1_nextcloud.log
           path: data/nextcloud.log
           if-no-files-found: warn
 

diff --git a/.github/workflows/tests-special.yml b/.github/workflows/tests-special.yml
@@ -49,13 +49,13 @@ jobs:
         with:
           submodules: true
           repository: nextcloud/server
-          ref: 'stable27'
+          ref: 'stable28'
 
       - name: Checkout Notifications
         uses: actions/checkout@v3
         with:
           repository: nextcloud/notifications
-          ref: ${{ matrix.server-version }}
+          ref: 'stable28'
           path: apps/notifications
 
       - name: Checkout AppAPI
@@ -162,7 +162,7 @@ jobs:
         with:
           submodules: true
           repository: nextcloud/server
-          ref: 'stable27'
+          ref: 'stable28'
 
       - name: Checkout AppAPI
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -29,9 +29,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version: [ '8.1' ]
-        server-version: [ 'stable27' ]
+        server-version: [ 'stable28' ]
         include:
-          - server-version: "stable28"
+          - server-version: "stable29"
             php-version: "8.2"
           - server-version: "master"
             php-version: "8.3"
@@ -158,7 +158,7 @@ jobs:
 
   nc-py-api-mysql:
     runs-on: ubuntu-22.04
-    name: NC_Py_API • stable27 • 8.1 • MySQL
+    name: NC_Py_API • stable28 • 8.1 • MySQL
 
     services:
       mysql:
@@ -182,13 +182,13 @@ jobs:
         with:
           submodules: true
           repository: nextcloud/server
-          ref: stable27
+          ref: stable28
 
       - name: Checkout Notifications
         uses: actions/checkout@v3
         with:
           repository: nextcloud/notifications
-          ref: stable27
+          ref: stable28
           path: apps/notifications
 
       - name: Checkout AppAPI
@@ -266,7 +266,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: mysql_nc_py_api_stable27_8.1_nextcloud.log
+          name: mysql_nc_py_api_stable28_8.1_nextcloud.log
           path: data/nextcloud.log
           if-no-files-found: warn
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,11 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2.8.0 - 2024-07-1x]
 
+Note: Nextcloud 27 is no longer supported since this version.
+
 ### Added
 
 - New OCS API endpoint to setAppInitProgress. The old one is marked as deprecated. #319
 - Added default timeout for requestToExApp function set to 3s. #277
 
+### Changed
+
+- Dropped support of Nextcloud 27. #322
+
 ### Fixed
 
 - Allow ExApps management disable and remove actions if default Deploy daemon is not accessible. #314

diff --git a/Makefile b/Makefile
@@ -15,32 +15,20 @@ help:
 	@echo " "
 	@echo "  Next commands are only for dev environment with nextcloud-docker-dev!"
 	@echo "  Daemon register(Linux, socket):"
-	@echo "  dock-sock          create docker daemon for Nextcloud 29, 28, 27 (/var/run/docker.sock)"
-	@echo "  dock-sock27        create docker daemon for Nextcloud 27 (/var/run/docker.sock)"
-	@echo "  dock-sock27-gpu    create docker daemon with GPU for Nextcloud 27 (/var/run/docker.sock)"
+	@echo "  dock-sock          create docker daemon for Nextcloud 30, 29, 28 (/var/run/docker.sock)"
 	@echo "  dock-sock28        create docker daemon for Nextcloud 28 (/var/run/docker.sock)"
 	@echo "  dock-sock28-gpu    create docker daemon with GPU for Nextcloud 28 (/var/run/docker.sock)"
+	@echo "  dock-sock29        create docker daemon for Nextcloud 29 (/var/run/docker.sock)"
+	@echo "  dock-sock29-gpu    create docker daemon with GPU for Nextcloud 29 (/var/run/docker.sock)"
 	@echo "  dock-sock          create docker daemon for Nextcloud Last (/var/run/docker.sock)"
 	@echo "  dock-sock-gpu      create docker daemon with GPU for Nextcloud Last (/var/run/docker.sock)"
 	@echo " "
 	@echo "  Daemon register(any OS, host:port)"
 	@echo "  dock2port          will map docker socket to port. first use this!"
-	@echo "  dock-port27        create docker daemon for Nextcloud 27 (host.docker.internal:8443)"
 	@echo "  dock-port28        create docker daemon for Nextcloud 28 (host.docker.internal:8443)"
+	@echo "  dock-port29        create docker daemon for Nextcloud 29 (host.docker.internal:8443)"
 	@echo "  dock-port          create docker daemons for Nextcloud Last (host.docker.internal:8443)"
 
-.PHONY: dock-sock27
-dock-sock27:
-	@echo "creating daemon for nextcloud 'stable27' container"
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:daemon:register \
-		docker_dev Docker docker-install http /var/run/docker.sock http://stable27.local/index.php --net=master_default
-
-.PHONY: dock-sock27-gpu
-dock-sock27-gpu:
-	@echo "creating daemon with NVIDIA gpu for nextcloud 'stable27' container"
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:daemon:register \
-		docker_dev_gpu "Docker with GPU" docker-install http /var/run/docker.sock http://stable27.local/index.php --net=master_default --gpu --set-default
-
 .PHONY: dock-sock28
 dock-sock28:
 	@echo "creating daemon for nextcloud 'stable28' container"
@@ -53,6 +41,18 @@ dock-sock28-gpu:
 	docker exec master-stable28-1 sudo -u www-data php occ app_api:daemon:register \
 		docker_dev_gpu "Docker with GPU" docker-install http /var/run/docker.sock http://stable28.local/index.php --net=master_default --gpu --set-default
 
+.PHONY: dock-sock29
+dock-sock29:
+	@echo "creating daemon for nextcloud 'stable29' container"
+	docker exec master-stable29-1 sudo -u www-data php occ app_api:daemon:register \
+		docker_dev Docker docker-install http /var/run/docker.sock http://stable29.local/index.php --net=master_default
+
+.PHONY: dock-sock29-gpu
+dock-sock29-gpu:
+	@echo "creating daemon with NVIDIA gpu for nextcloud 'stable29' container"
+	docker exec master-stable29-1 sudo -u www-data php occ app_api:daemon:register \
+		docker_dev_gpu "Docker with GPU" docker-install http /var/run/docker.sock http://stable29.local/index.php --net=master_default --gpu --set-default
+
 .PHONY: dock-sock
 dock-sock:
 	@echo "creating daemon for nextcloud 'master' container"
@@ -74,20 +74,20 @@ dock2port:
       --net=master_default \
       --restart unless-stopped --privileged -d ghcr.io/cloud-py-api/nextcloud-appapi-dsp:latest
 
-.PHONY: dock-port27
-dock-port27:
-	@echo "creating daemon for nextcloud '27' container"
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:daemon:register \
-        docker_dev Docker docker-install http nextcloud-appapi-dsp:2375 http://stable27.local/index.php \
-        --net=master_default --haproxy_password="some_secure_password"
-
 .PHONY: dock-port28
 dock-port28:
-	@echo "creating daemon for nextcloud '27' container"
+	@echo "creating daemon for nextcloud '28' container"
 	docker exec master-stable28-1 sudo -u www-data php occ app_api:daemon:register \
         docker_dev Docker docker-install http nextcloud-appapi-dsp:2375 http://stable28.local/index.php \
         --net=master_default --haproxy_password="some_secure_password"
 
+.PHONY: dock-port29
+dock-port29:
+	@echo "creating daemon for nextcloud '29' container"
+	docker exec master-stable29-1 sudo -u www-data php occ app_api:daemon:register \
+        docker_dev Docker docker-install http nextcloud-appapi-dsp:2375 http://stable29.local/index.php \
+        --net=master_default --haproxy_password="some_secure_password"
+
 .PHONY: dock-port
 dock-port:
 	@echo "creating daemon for nextcloud 'master' container"

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -63,7 +63,7 @@ to join us in shaping a more versatile, stable, and secure app landscape.
 	<screenshot>https://raw.githubusercontent.com/cloud-py-api/app_api/main/screenshots/app_api_4.png</screenshot>
 	<dependencies>
 		<php min-version="8.1"/>
-		<nextcloud min-version="27" max-version="30"/>
+		<nextcloud min-version="28" max-version="30"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AppAPI\BackgroundJob\ExAppInitStatusCheckJob</job>

diff --git a/lib/Listener/LoadFilesPluginListener.php b/lib/Listener/LoadFilesPluginListener.php
@@ -36,12 +36,7 @@ public function handle(Event $event): void {
 				'fileActions' => $exFilesActions,
 				'instanceId' => $this->config->getSystemValue('instanceid'),
 			]);
-			$ncVersion = $this->config->getSystemValueString('version', '0.0.0');
-			if (version_compare($ncVersion, '28.0', '<')) {
-				Util::addScript(Application::APP_ID, Application::APP_ID . '-filesplugin');
-			} else {
-				Util::addScript(Application::APP_ID, Application::APP_ID . '-filesplugin28');
-			}
+			Util::addScript(Application::APP_ID, Application::APP_ID . '-filesplugin');
 			Util::addStyle(Application::APP_ID, 'filesactions');
 		}
 	}