Merge pull request #2654 from nextcloud/increase-master-version

Update app versions and requirements
2016-12-14 11:20:58 +01:00 · 2016-12-14 11:20:58 +01:00 · cd1929382f
parent 4f96fcfb9d 77b6b7b23e
commit cd1929382f
23 changed files with 50 additions and 49 deletions
--- a/apps/admin_audit/appinfo/info.xml
+++ b/apps/admin_audit/appinfo/info.xml
@ -7,9 +7,9 @@
 	</description>
 	<licence>AGPL</licence>
 	<author>Nextcloud</author>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<types>
 		<logging/>
--- a/apps/comments/appinfo/info.xml
+++ b/apps/comments/appinfo/info.xml
@ -6,9 +6,9 @@
 	<licence>AGPL</licence>
 	<author>Arthur Schiwon, Vincent Petry</author>
 	<default_enable/>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<types>
 		<logging/>
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@ -5,7 +5,7 @@
 	<description>WebDAV endpoint</description>
 	<licence>AGPL</licence>
 	<author>owncloud.org</author>
-	<version>1.1.1</version>
+	<version>1.2.0</version>
 	<default_enable/>
 	<types>
 		<filesystem/>
@ -15,7 +15,7 @@
 		<webdav>appinfo/v1/publicwebdav.php</webdav>
 	</public>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\DAV\CardDAV\SyncJob</job>
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@ -19,13 +19,13 @@
 		<admin>admin-encryption</admin>
 	</documentation>
 	<rememberlogin>false</rememberlogin>
-	<version>1.4.1</version>
+	<version>1.5.0</version>
 	<types>
 		<filesystem/>
 	</types>
 	<dependencies>
 		<lib>openssl</lib>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<settings>
 		<admin>OCA\Encryption\Settings\Admin</admin>
--- a/apps/federatedfilesharing/appinfo/info.xml
+++ b/apps/federatedfilesharing/appinfo/info.xml
@ -5,11 +5,11 @@
    <description>Provide federated file sharing across servers</description>
    <licence>AGPL</licence>
    <author>Bjoern Schiessle, Roeland Jago Douma</author>
-    <version>1.1.1</version>
+    <version>1.2.0</version>
    <namespace>FederatedFileSharing</namespace>
    <category>other</category>
    <dependencies>
-        <nextcloud min-version="11" max-version="11" />
+        <nextcloud min-version="12" max-version="12" />
    </dependencies>
    <settings>
        <admin>OCA\FederatedFileSharing\Settings\Admin</admin>
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@ -5,11 +5,11 @@
 	<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
 	<licence>AGPL</licence>
 	<author>Bjoern Schiessle</author>
-	<version>1.1.1</version>
+	<version>1.2.0</version>
 	<namespace>Federation</namespace>
 	<category>other</category>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<default_enable/>
 	<types>
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@ -6,12 +6,12 @@
 	<licence>AGPL</licence>
 	<author>Robin Appelman, Vincent Petry</author>
 	<default_enable/>
-	<version>1.6.1</version>
+	<version>1.7.0</version>
 	<types>
 		<filesystem/>
 	</types>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<documentation>
 		<user>user-files</user>
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@ -13,7 +13,7 @@
 		<admin>admin-external-storage</admin>
 	</documentation>
 	<rememberlogin>false</rememberlogin>
-	<version>1.1.2</version>
+	<version>1.2.0</version>
 	<types>
 		<filesystem/>
 	</types>
@ -22,7 +22,7 @@
 	<namespace>Files_External</namespace>

 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>

 	<settings>
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@ -10,12 +10,12 @@ Turning the feature off removes shared files and folders on the server for all s
 	<licence>AGPL</licence>
 	<author>Michael Gapczynski, Bjoern Schiessle</author>
 	<default_enable/>
-	<version>1.1.1</version>
+	<version>1.2.0</version>
 	<types>
 		<filesystem/>
 	</types>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<public>
 		<files>public.php</files>
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@ -10,13 +10,13 @@ To prevent a user from running out of disk space, the Deleted files app will not
 	<licence>AGPL</licence>
 	<author>Bjoern Schiessle</author>
 	<default_enable/>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 	<types>
 		<filesystem/>
 	</types>
 	<namespace>Files_Trashbin</namespace>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<documentation>
 		<user>user-trashbin</user>
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@ -8,13 +8,13 @@
 	This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.
 In addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation.
 	</description>
-	<version>1.4.0</version>
+	<version>1.5.0</version>
 	<types>
 		<filesystem/>
 	</types>
 	<namespace>Files_Versions</namespace>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<documentation>
 		<user>user-versions</user>
--- a/apps/provisioning_api/appinfo/info.xml
+++ b/apps/provisioning_api/appinfo/info.xml
@ -17,12 +17,12 @@
 	<documentation>
 		<admin>admin-provisioning-api</admin>
 	</documentation>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 	<namespace>Provisioning_API</namespace>
 	<types>
 		<prevent_group_restriction/>
 	</types>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 </info>
--- a/apps/sharebymail/appinfo/info.xml
+++ b/apps/sharebymail/appinfo/info.xml
@ -5,11 +5,11 @@
    <description>Share provider which allows you to share files by mail</description>
    <licence>AGPL</licence>
    <author>Bjoern Schiessle</author>
-    <version>1.0.1</version>
+    <version>1.1.0</version>
    <namespace>ShareByMail</namespace>
    <category>other</category>
    <dependencies>
-        <nextcloud min-version="11" max-version="11" />
+        <nextcloud min-version="12" max-version="12" />
    </dependencies>
    <default_enable/>

--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@ -7,9 +7,9 @@
 	<licence>AGPL</licence>
 	<author>Vincent Petry, Joas Schilling</author>
 	<default_enable/>
-	<version>1.1.3</version>
+	<version>1.2.0</version>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 	<namespace>SystemTags</namespace>
 	<types>
--- a/apps/testing/appinfo/info.xml
+++ b/apps/testing/appinfo/info.xml
@ -5,8 +5,8 @@
 	<description>This app is only for testing! It is dangerous to have it enabled in a live instance</description>
 	<licence>AGPL</licence>
 	<author>Joas Schilling</author>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 </info>
--- a/apps/theming/appinfo/info.xml
+++ b/apps/theming/appinfo/info.xml
@ -5,12 +5,12 @@
 	<description>Adjust the Nextcloud theme</description>
 	<licence>AGPL</licence>
 	<author>Nextcloud</author>
-	<version>1.1.1</version>
+	<version>1.2.0</version>
 	<namespace>Theming</namespace>
 	<category>other</category>

 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>

 	<types>
--- a/apps/twofactor_backupcodes/appinfo/info.xml
+++ b/apps/twofactor_backupcodes/appinfo/info.xml
@ -5,7 +5,7 @@
 	<description>A two-factor auth backup codes provider</description>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<namespace>TwoFactorBackupCodes</namespace>
 	<category>other</category>

@ -14,6 +14,6 @@
 	</two-factor-providers>

 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 </info>
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@ -5,11 +5,11 @@
 	<description>Displays update notifications for ownCloud and provides the SSO for the updater.</description>
 	<licence>AGPL</licence>
 	<author>Lukas Reschke</author>
-	<version>1.1.1</version>
+	<version>1.2.0</version>
 	<namespace>UpdateNotification</namespace>
 	<default_enable/>
 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>

 	<background-jobs>
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@ -9,7 +9,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
 	</description>
 	<licence>AGPL</licence>
 	<author>Dominik Schmidt and Arthur Schiwon</author>
-	<version>1.1.1</version>
+	<version>1.2.0</version>
 	<types>
 		<authentication/>
 	</types>
@ -18,7 +18,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
 	</documentation>
 	<dependencies>
 		<lib>ldap</lib>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>

 	<namespace>User_LDAP</namespace>
--- a/apps/workflowengine/appinfo/info.xml
+++ b/apps/workflowengine/appinfo/info.xml
@ -5,7 +5,7 @@
 	<description></description>
 	<licence>AGPL</licence>
 	<author>Morris Jobke</author>
-	<version>1.1.1</version>
+	<version>1.2.0</version>
 	<namespace>WorkflowEngine</namespace>

 	<category>other</category>
@ -18,7 +18,7 @@
 	</types>

 	<dependencies>
-		<nextcloud min-version="11" max-version="11" />
+		<nextcloud min-version="12" max-version="12" />
 	</dependencies>

 	<settings>
--- a/lib/private/App/AppStore/Fetcher/AppFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@ -50,7 +50,7 @@ class AppFetcher extends Fetcher {
 		$this->fileName = 'apps.json';
 		$this->config = $config;

-		$versionArray = \OC_Util::getVersion();
+		$versionArray = explode('.', $this->config->getSystemValue('version'));
 		$this->endpointUrl = sprintf(
 			'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json',
 			$versionArray[0],
--- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
+++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
@ -58,6 +58,12 @@ EOD;
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->config = $this->createMock(IConfig::class);

+		$this->config
+			->expects($this->atLeastOnce())
+			->method('getSystemValue')
+			->with('version')
+			->willReturn('11.0.0.2');
+
 		$this->fetcher = new AppFetcher(
 			$this->appData,
 			$this->clientService,
@ -103,11 +109,6 @@ EOD;
 			->expects($this->once())
 			->method('getTime')
 			->willReturn(1234);
-		$this->config
-			->expects($this->once())
-			->method('getSystemValue')
-			->with('version')
-			->willReturn('11.0.0.2');

 		$expected = array (
 			'data' =>
--- a/version.php
+++ b/version.php
@ -26,12 +26,12 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.

-$OC_Version = array(11, 0, 0, 10);
+$OC_Version = array(12, 0, 0, 10);

 // The human readable string
-$OC_VersionString = '11.0.0';
+$OC_VersionString = '12.0 alpha';

-$OC_VersionCanBeUpgradedFrom = array(9, 1);
+$OC_VersionCanBeUpgradedFrom = array(11);

 // default Nextcloud channel
 $OC_Channel = 'git';