diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml index 14bce64aab..9886255409 100644 --- a/apps/admin_audit/appinfo/info.xml +++ b/apps/admin_audit/appinfo/info.xml @@ -7,9 +7,9 @@ AGPL Nextcloud - 1.1.0 + 1.2.0 - + diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml index 9d5409a2d6..eb711c4b56 100644 --- a/apps/comments/appinfo/info.xml +++ b/apps/comments/appinfo/info.xml @@ -6,9 +6,9 @@ AGPL Arthur Schiwon, Vincent Petry - 1.1.0 + 1.2.0 - + diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index f362c882f9..31341a80a0 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -5,7 +5,7 @@ WebDAV endpoint AGPL owncloud.org - 1.1.1 + 1.2.0 @@ -15,7 +15,7 @@ appinfo/v1/publicwebdav.php - + OCA\DAV\CardDAV\SyncJob diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml index 0bb3efebf5..1e63ca5c47 100644 --- a/apps/encryption/appinfo/info.xml +++ b/apps/encryption/appinfo/info.xml @@ -19,13 +19,13 @@ admin-encryption false - 1.4.1 + 1.5.0 openssl - + OCA\Encryption\Settings\Admin diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml index 6a414496f3..dc5cbffaa8 100644 --- a/apps/federatedfilesharing/appinfo/info.xml +++ b/apps/federatedfilesharing/appinfo/info.xml @@ -5,11 +5,11 @@ Provide federated file sharing across servers AGPL Bjoern Schiessle, Roeland Jago Douma - 1.1.1 + 1.2.0 FederatedFileSharing other - + OCA\FederatedFileSharing\Settings\Admin diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml index a5eeb133d9..2d15f20485 100644 --- a/apps/federation/appinfo/info.xml +++ b/apps/federation/appinfo/info.xml @@ -5,11 +5,11 @@ 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. AGPL Bjoern Schiessle - 1.1.1 + 1.2.0 Federation other - + diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 35e58b7202..a25c043f33 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -6,12 +6,12 @@ AGPL Robin Appelman, Vincent Petry - 1.6.1 + 1.7.0 - + user-files diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index c221ba4145..b2f73dce62 100644 --- a/apps/files_external/appinfo/info.xml +++ b/apps/files_external/appinfo/info.xml @@ -13,7 +13,7 @@ admin-external-storage false - 1.1.2 + 1.2.0 @@ -22,7 +22,7 @@ Files_External - + diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index cff424d223..322efdb6c0 100644 --- 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 AGPL Michael Gapczynski, Bjoern Schiessle - 1.1.1 + 1.2.0 - + public.php diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index 04b8a7293c..a756013568 100644 --- 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 AGPL Bjoern Schiessle - 1.1.0 + 1.2.0 Files_Trashbin - + user-trashbin diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml index 5eb0df91d8..5304051d75 100644 --- 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. - 1.4.0 + 1.5.0 Files_Versions - + user-versions diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml index 0ebcee9a7f..e633df00bd 100644 --- a/apps/provisioning_api/appinfo/info.xml +++ b/apps/provisioning_api/appinfo/info.xml @@ -17,12 +17,12 @@ admin-provisioning-api - 1.1.0 + 1.2.0 Provisioning_API - + diff --git a/apps/sharebymail/appinfo/info.xml b/apps/sharebymail/appinfo/info.xml index 56977fcf28..5528f6158d 100644 --- a/apps/sharebymail/appinfo/info.xml +++ b/apps/sharebymail/appinfo/info.xml @@ -5,11 +5,11 @@ Share provider which allows you to share files by mail AGPL Bjoern Schiessle - 1.0.1 + 1.1.0 ShareByMail other - + diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml index 1d5f33207a..02cafdb4d2 100644 --- a/apps/systemtags/appinfo/info.xml +++ b/apps/systemtags/appinfo/info.xml @@ -7,9 +7,9 @@ AGPL Vincent Petry, Joas Schilling - 1.1.3 + 1.2.0 - + SystemTags diff --git a/apps/testing/appinfo/info.xml b/apps/testing/appinfo/info.xml index 41b07447d5..35ee3715b5 100644 --- a/apps/testing/appinfo/info.xml +++ b/apps/testing/appinfo/info.xml @@ -5,8 +5,8 @@ This app is only for testing! It is dangerous to have it enabled in a live instance AGPL Joas Schilling - 1.1.0 + 1.2.0 - + diff --git a/apps/theming/appinfo/info.xml b/apps/theming/appinfo/info.xml index 3a8867dc6f..9ded5c89b8 100644 --- a/apps/theming/appinfo/info.xml +++ b/apps/theming/appinfo/info.xml @@ -5,12 +5,12 @@ Adjust the Nextcloud theme AGPL Nextcloud - 1.1.1 + 1.2.0 Theming other - + diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml index d5dd3f4db9..5f956c6a86 100644 --- a/apps/twofactor_backupcodes/appinfo/info.xml +++ b/apps/twofactor_backupcodes/appinfo/info.xml @@ -5,7 +5,7 @@ A two-factor auth backup codes provider agpl Christoph Wurst - 1.0.0 + 1.1.0 TwoFactorBackupCodes other @@ -14,6 +14,6 @@ - + diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml index 4cd84ac827..d920e866f1 100644 --- a/apps/updatenotification/appinfo/info.xml +++ b/apps/updatenotification/appinfo/info.xml @@ -5,11 +5,11 @@ Displays update notifications for ownCloud and provides the SSO for the updater. AGPL Lukas Reschke - 1.1.1 + 1.2.0 UpdateNotification - + diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml index 87eb61a0fb..7535790fa5 100644 --- 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 AGPL Dominik Schmidt and Arthur Schiwon - 1.1.1 + 1.2.0 @@ -18,7 +18,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce ldap - + User_LDAP diff --git a/apps/workflowengine/appinfo/info.xml b/apps/workflowengine/appinfo/info.xml index 83f4be9e39..b037174d34 100644 --- a/apps/workflowengine/appinfo/info.xml +++ b/apps/workflowengine/appinfo/info.xml @@ -5,7 +5,7 @@ AGPL Morris Jobke - 1.1.1 + 1.2.0 WorkflowEngine other @@ -18,7 +18,7 @@ - + diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index bbe75c723d..b8efdef433 100644 --- 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], diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php index aa0d50cac9..a9cd5a190d 100644 --- 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' => diff --git a/version.php b/version.php index 9d31dd8b0e..3703bbcb09 100644 --- 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';