Merge pull request #1198 from nextcloud/feature/noid/the-new-master

Split 14 and 15

.drone.yml

@@ -17,7 +17,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-19
     environment:
       - APP_NAME=spreed
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -35,7 +35,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-19
     environment:
       - APP_NAME=spreed
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -51,7 +51,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-19
     environment:
       - APP_NAME=spreed
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -67,7 +67,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-19
     environment:
       - APP_NAME=spreed
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -87,7 +87,7 @@ pipeline:
     image: nextcloudci/php7.1:php7.1-16
     environment:
       - APP_NAME=spreed
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -107,7 +107,7 @@ pipeline:
     image: nextcloudci/php7.2:php7.2-12
     environment:
       - APP_NAME=spreed
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -127,7 +127,7 @@ pipeline:
     image: nextcloudci/php7.1:php7.1-16
     environment:
       - APP_NAME=spreed
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
     commands:
       # Pre-setup steps
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
@@ -155,7 +155,7 @@ pipeline:
     image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
     environment:
       - APP_NAME=spreed
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
     commands:
       # Pre-setup steps
       - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server ../server
@@ -173,7 +173,7 @@ pipeline:
     image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
     environment:
       - APP_NAME=spreed
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
     commands:
       # Pre-setup steps
       - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server ../server

appinfo/info.xml

@@ -17,7 +17,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>4.0.0</version>
+	<version>4.99.0</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
@@ -44,7 +44,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 	<screenshot>https://raw.githubusercontent.com/nextcloud/spreed/master/docs/contacts-menu.png</screenshot>
 
 	<dependencies>
-		<nextcloud min-version="14" max-version="14" />
+		<nextcloud min-version="15" max-version="15" />
 	</dependencies>
 
 	<background-jobs>

tests/integration/spreedcheats/appinfo/info.xml

@@ -14,6 +14,6 @@
 	</types>
 
 	<dependencies>
-		<nextcloud min-version="14" max-version="14" />
+		<nextcloud min-version="15" max-version="15" />
 	</dependencies>
 </info>