Merge branch '0.16.x' of github.com:appwrite/appwrite into 0.16.shmuel.1

 Conflicts:
	composer.lock
This commit is contained in:
fogelito 2022-09-06 21:03:47 +03:00
commit 4604578864
4 changed files with 31 additions and 41 deletions

View file

@ -15,7 +15,7 @@ return [
[
'key' => 'web',
'name' => 'Web',
'version' => '10.0.0-RC1',
'version' => '10.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-web',
'package' => 'https://www.npmjs.com/package/appwrite',
'enabled' => true,
@ -63,7 +63,7 @@ return [
[
'key' => 'flutter',
'name' => 'Flutter',
'version' => '8.0.0-dev.1',
'version' => '8.0.0-dev.2',
'url' => 'https://github.com/appwrite/sdk-for-flutter',
'package' => 'https://pub.dev/packages/appwrite',
'enabled' => true,
@ -81,7 +81,7 @@ return [
[
'key' => 'apple',
'name' => 'Apple',
'version' => '1.0.0-RC1',
'version' => '1.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-apple',
'package' => 'https://github.com/appwrite/sdk-for-apple',
'enabled' => true,
@ -162,7 +162,7 @@ return [
[
'key' => 'web',
'name' => 'Console',
'version' => '7.0.0-RC1',
'version' => '7.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-console',
'package' => '',
'enabled' => true,
@ -180,7 +180,7 @@ return [
[
'key' => 'cli',
'name' => 'Command Line',
'version' => '1.0.0-RC1',
'version' => '1.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-cli',
'package' => 'https://www.npmjs.com/package/appwrite-cli',
'enabled' => true,
@ -208,7 +208,7 @@ return [
[
'key' => 'nodejs',
'name' => 'Node.js',
'version' => '8.0.0-RC1',
'version' => '8.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-node',
'package' => 'https://www.npmjs.com/package/node-appwrite',
'enabled' => true,
@ -226,7 +226,7 @@ return [
[
'key' => 'deno',
'name' => 'Deno',
'version' => '6.0.0-RC1',
'version' => '6.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-deno',
'package' => 'https://deno.land/x/appwrite',
'enabled' => true,
@ -244,7 +244,7 @@ return [
[
'key' => 'php',
'name' => 'PHP',
'version' => '7.0.0-RC1',
'version' => '7.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-php',
'package' => 'https://packagist.org/packages/appwrite/appwrite',
'enabled' => true,
@ -262,7 +262,7 @@ return [
[
'key' => 'python',
'name' => 'Python',
'version' => '1.0.0-RC1',
'version' => '1.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-python',
'package' => 'https://pypi.org/project/appwrite/',
'enabled' => true,
@ -280,7 +280,7 @@ return [
[
'key' => 'ruby',
'name' => 'Ruby',
'version' => '7.0.0-RC1',
'version' => '7.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-ruby',
'package' => 'https://rubygems.org/gems/appwrite',
'enabled' => true,
@ -298,7 +298,7 @@ return [
[
'key' => 'go',
'name' => 'Go',
'version' => '1.0.0-RC1',
'version' => '1.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-go',
'package' => '',
'enabled' => false,
@ -334,7 +334,7 @@ return [
[
'key' => 'dotnet',
'name' => '.NET',
'version' => '1.0.0-RC1',
'version' => '1.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-dotnet',
'package' => 'https://www.nuget.org/packages/Appwrite',
'enabled' => false,
@ -352,7 +352,7 @@ return [
[
'key' => 'dart',
'name' => 'Dart',
'version' => '7.0.0-dev.1',
'version' => '7.0.0-dev.2',
'url' => 'https://github.com/appwrite/sdk-for-dart',
'package' => 'https://pub.dev/packages/dart_appwrite',
'enabled' => true,
@ -392,7 +392,7 @@ return [
[
'key' => 'swift',
'name' => 'Swift',
'version' => '1.0.0-RC1',
'version' => '1.0.0-RC2',
'url' => 'https://github.com/appwrite/sdk-for-swift',
'package' => 'https://github.com/appwrite/sdk-for-swift',
'enabled' => true,

View file

@ -77,7 +77,7 @@
}
],
"require-dev": {
"appwrite/sdk-generator": "0.24.0",
"appwrite/sdk-generator": "0.25.0",
"ext-fileinfo": "*",
"phpunit/phpunit": "9.5.20",
"squizlabs/php_codesniffer": "^3.6",

41
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "3c12ac9a58f1a730f55400266b1d4376",
"content-hash": "aca68a1c1c7d762cabd02ce02cf40df4",
"packages": [
{
"name": "adhocore/jwt",
@ -2060,16 +2060,16 @@
},
{
"name": "utopia-php/database",
"version": "dev-fix-5permissions",
"version": "0.25.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/database.git",
"reference": "329cabb4bf2b71e35151f400bb280d617a269e91"
"reference": "167fb53a6c199d4b9ce5fc513c78774ee92199e7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/database/zipball/329cabb4bf2b71e35151f400bb280d617a269e91",
"reference": "329cabb4bf2b71e35151f400bb280d617a269e91",
"url": "https://api.github.com/repos/utopia-php/database/zipball/167fb53a6c199d4b9ce5fc513c78774ee92199e7",
"reference": "167fb53a6c199d4b9ce5fc513c78774ee92199e7",
"shasum": ""
},
"require": {
@ -2118,9 +2118,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/database/issues",
"source": "https://github.com/utopia-php/database/tree/fix-5permissions"
"source": "https://github.com/utopia-php/database/tree/0.25.0"
},
"time": "2022-09-06T17:56:27+00:00"
"time": "2022-09-06T07:53:26+00:00"
},
{
"name": "utopia-php/domains",
@ -2840,16 +2840,16 @@
"packages-dev": [
{
"name": "appwrite/sdk-generator",
"version": "0.24.0",
"version": "0.25.0",
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-generator.git",
"reference": "310ab7210ee97266632ee2df9616c9770c7b37e6"
"reference": "91e2b9bfb06521faabd610935cbfc1825110666a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/310ab7210ee97266632ee2df9616c9770c7b37e6",
"reference": "310ab7210ee97266632ee2df9616c9770c7b37e6",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/91e2b9bfb06521faabd610935cbfc1825110666a",
"reference": "91e2b9bfb06521faabd610935cbfc1825110666a",
"shasum": ""
},
"require": {
@ -2884,9 +2884,9 @@
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
"support": {
"issues": "https://github.com/appwrite/sdk-generator/issues",
"source": "https://github.com/appwrite/sdk-generator/tree/0.24.0"
"source": "https://github.com/appwrite/sdk-generator/tree/0.25.0"
},
"time": "2022-09-05T06:37:25+00:00"
"time": "2022-09-06T16:32:52+00:00"
},
{
"name": "doctrine/instantiator",
@ -5358,18 +5358,9 @@
"time": "2022-08-12T06:47:24+00:00"
}
],
"aliases": [
{
"package": "utopia-php/database",
"version": "dev-fix-5permissions",
"alias": "0.25.0",
"alias_normalized": "0.25.0.0"
}
],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"utopia-php/database": 20
},
"stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
@ -5393,5 +5384,5 @@
"platform-overrides": {
"php": "8.0"
},
"plugin-api-version": "2.2.0"
"plugin-api-version": "2.3.0"
}

View file

@ -3,4 +3,3 @@ appwrite avatars getInitials \