CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-29 08:51:28 +13:00
Code Issues Projects Releases Wiki Activity

Merge branch '0.9.x' of github.com:appwrite/appwrite into feat-add-response-filters

Browse source
This commit is contained in:
Christy Jacob 2021-07-01 19:41:33 +05:30
commit 5581fb23a0
4 changed files with 113 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/config/platforms.php
View file

@ -111,7 +111,7 @@ return [
[ [
'key' => 'android', 'key' => 'android',
'name' => 'Android', 'name' => 'Android',
'version' => '0.0.0-SNAPSHOT', 'version' => '0.0.1',
'url' => 'https://github.com/appwrite/sdk-for-android', 'url' => 'https://github.com/appwrite/sdk-for-android',
'package' => 'https://repo1.maven.org/maven2/io/appwrite/sdk-for-android/', 'package' => 'https://repo1.maven.org/maven2/io/appwrite/sdk-for-android/',
'enabled' => true, 'enabled' => true,
@ -346,6 +346,23 @@ return [
'gitRepoName' => 'sdk-for-cli', 'gitRepoName' => 'sdk-for-cli',
'gitUserName' => 'appwrite', 'gitUserName' => 'appwrite',
], ],
[
'key' => 'kotlin',
'name' => 'Kotlin',
'version' => '0.0.1',
'url' => 'https://github.com/appwrite/sdk-for-kotlin',
'package' => 'https://repo1.maven.org/maven2/io/appwrite/sdk-for-kotlin/',
'enabled' => true,
'beta' => true,
'dev' => false,
'hidden' => false,
'family' => APP_PLATFORM_SERVER,
'prism' => 'kotlin',
'source' => \realpath(__DIR__ . '/../sdks/server-kotlin'),
'gitUrl' => 'git@github.com:appwrite/sdk-for-kotlin.git',
'gitRepoName' => 'sdk-for-kotlin',
'gitUserName' => 'appwrite',
],
], ],
], ],
]; ];

4
app/tasks/sdks.php
View file

@ -16,6 +16,7 @@ use Appwrite\SDK\Language\DotNet;
use Appwrite\SDK\Language\Flutter; use Appwrite\SDK\Language\Flutter;
use Appwrite\SDK\Language\Go; use Appwrite\SDK\Language\Go;
use Appwrite\SDK\Language\Kotlin; use Appwrite\SDK\Language\Kotlin;
use Appwrite\SDK\Language\Android;
use Appwrite\SDK\Language\Swift; use Appwrite\SDK\Language\Swift;
$cli $cli
@ -142,6 +143,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
$config = new DotNet(); $config = new DotNet();
break; break;
case 'android': case 'android':
$config = new Android();
break;
case 'kotlin':
$config = new Kotlin(); $config = new Kotlin();
break; break;
default: default:

2
composer.json
View file

@ -62,7 +62,7 @@
"slickdeals/statsd": "3.1.0" "slickdeals/statsd": "3.1.0"
}, },
"require-dev": { "require-dev": {
"appwrite/sdk-generator": "0.10.11", "appwrite/sdk-generator": "0.11.0",
"swoole/ide-helper": "4.6.7", "swoole/ide-helper": "4.6.7",
"phpunit/phpunit": "9.5.6", "phpunit/phpunit": "9.5.6",
"vimeo/psalm": "4.7.2" "vimeo/psalm": "4.7.2"

120
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "f0045a975cc1e8215cdfef44472b702f", "content-hash": "b30bdf7eb1369ae7f2f742e2f30055ae",
"packages": [ "packages": [
{ {
"name": "adhocore/jwt", "name": "adhocore/jwt",
@ -574,29 +574,32 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "1.8.2", "version": "2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "dc960a912984efb74d0a90222870c72c87f10c91" "reference": "1dc8d9cba3897165e16d12bb13d813afb1eb3fe7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", "url": "https://api.github.com/repos/guzzle/psr7/zipball/1dc8d9cba3897165e16d12bb13d813afb1eb3fe7",
"reference": "dc960a912984efb74d0a90222870c72c87f10c91", "reference": "1dc8d9cba3897165e16d12bb13d813afb1eb3fe7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.4.0", "php": "^7.2.5 || ^8.0",
"psr/http-message": "~1.0", "psr/http-factory": "^1.0",
"ralouphie/getallheaders": "^2.0.5 || ^3.0.0" "psr/http-message": "^1.0",
"ralouphie/getallheaders": "^3.0"
}, },
"provide": { "provide": {
"psr/http-factory-implementation": "1.0",
"psr/http-message-implementation": "1.0" "psr/http-message-implementation": "1.0"
}, },
"require-dev": { "require-dev": {
"ext-zlib": "*", "bamarni/composer-bin-plugin": "^1.4.1",
"phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" "http-interop/http-factory-tests": "^0.9",
"phpunit/phpunit": "^8.5.8 || ^9.3.10"
}, },
"suggest": { "suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@ -604,16 +607,13 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7-dev" "dev-master": "2.0-dev"
} }
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"GuzzleHttp\\Psr7\\": "src/" "GuzzleHttp\\Psr7\\": "src/"
}, }
"files": [
"src/functions_include.php"
]
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -628,6 +628,11 @@
{ {
"name": "Tobias Schultze", "name": "Tobias Schultze",
"homepage": "https://github.com/Tobion" "homepage": "https://github.com/Tobion"
},
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com",
"homepage": "https://sagikazarmark.hu"
} }
], ],
"description": "PSR-7 message implementation that also provides common utility methods", "description": "PSR-7 message implementation that also provides common utility methods",
@ -643,9 +648,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.8.2" "source": "https://github.com/guzzle/psr7/tree/2.0.0"
}, },
"time": "2021-04-26T09:17:50+00:00" "time": "2021-06-30T20:03:07+00:00"
}, },
{ {
"name": "influxdb/influxdb-php", "name": "influxdb/influxdb-php",
@ -960,6 +965,61 @@
}, },
"time": "2020-06-29T06:28:15+00:00" "time": "2020-06-29T06:28:15+00:00"
}, },
{
"name": "psr/http-factory",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-factory.git",
"reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
"reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
"shasum": ""
},
"require": {
"php": ">=7.0.0",
"psr/http-message": "^1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Http\\Message\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interfaces for PSR-7 HTTP message factories",
"keywords": [
"factory",
"http",
"message",
"psr",
"psr-17",
"psr-7",
"request",
"response"
],
"support": {
"source": "https://github.com/php-fig/http-factory/tree/master"
},
"time": "2019-04-30T12:38:16+00:00"
},
{ {
"name": "psr/http-message", "name": "psr/http-message",
"version": "1.0.1", "version": "1.0.1",
@ -2343,16 +2403,16 @@
}, },
{ {
"name": "appwrite/sdk-generator", "name": "appwrite/sdk-generator",
"version": "0.10.11", "version": "0.11.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/appwrite/sdk-generator.git", "url": "https://github.com/appwrite/sdk-generator.git",
"reference": "f73391d482660798f4077d54760d67e633bdde1e" "reference": "96c41c44f930a4d40184cd0f3c7dca76d2cca7e1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/f73391d482660798f4077d54760d67e633bdde1e", "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/96c41c44f930a4d40184cd0f3c7dca76d2cca7e1",
"reference": "f73391d482660798f4077d54760d67e633bdde1e", "reference": "96c41c44f930a4d40184cd0f3c7dca76d2cca7e1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2386,9 +2446,9 @@
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
"support": { "support": {
"issues": "https://github.com/appwrite/sdk-generator/issues", "issues": "https://github.com/appwrite/sdk-generator/issues",
"source": "https://github.com/appwrite/sdk-generator/tree/0.10.11" "source": "https://github.com/appwrite/sdk-generator/tree/0.11.0"
}, },
"time": "2021-06-07T11:37:50+00:00" "time": "2021-07-01T13:51:23+00:00"
}, },
{ {
"name": "composer/package-versions-deprecated", "name": "composer/package-versions-deprecated",
@ -5638,16 +5698,16 @@
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
"version": "v5.3.2", "version": "v5.3.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/string.git", "url": "https://github.com/symfony/string.git",
"reference": "0732e97e41c0a590f77e231afc16a327375d50b0" "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/0732e97e41c0a590f77e231afc16a327375d50b0", "url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
"reference": "0732e97e41c0a590f77e231afc16a327375d50b0", "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5701,7 +5761,7 @@
"utf8" "utf8"
], ],
"support": { "support": {
"source": "https://github.com/symfony/string/tree/v5.3.2" "source": "https://github.com/symfony/string/tree/v5.3.3"
}, },
"funding": [ "funding": [
{ {
@ -5717,7 +5777,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-06-06T09:51:56+00:00" "time": "2021-06-27T11:44:38+00:00"
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",
@ -6028,5 +6088,5 @@
"platform-overrides": { "platform-overrides": {
"php": "8.0" "php": "8.0"
}, },
"plugin-api-version": "2.0.0" "plugin-api-version": "2.1.0"
} }