Skip to content

Update Kotlin dependencies - use latest Kotlin and Ktor versions #12949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
{{/kotlinx_serialization}}
{{#jvm-okhttp3}}
implementation "com.squareup.okhttp3:okhttp:3.14.9"
implementation "com.squareup.okhttp3:okhttp:3.12.13"
{{/jvm-okhttp3}}
{{#jvm-okhttp4}}
implementation "com.squareup.okhttp3:okhttp:4.10.0"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/kotlin-okhttp3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
implementation "com.squareup.okhttp3:okhttp:3.14.9"
implementation "com.squareup.okhttp3:okhttp:3.12.13"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}
Original file line number Diff line number Diff line change
@@ -1,183 +0,0 @@
# coding: utf-8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Marek00Malik could you please revert this file?


"""
OpenAPI Petstore

This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501

The version of the OpenAPI document: 1.0.0
Generated by: https://openapi-generator.tech
"""


try:
from inspect import getfullargspec
except ImportError:
from inspect import getargspec as getfullargspec
import pprint
import re # noqa: F401
import six

from petstore_api.configuration import Configuration


class ApiResponse(object):
"""NOTE: This class is auto generated by OpenAPI Generator.
Ref: https://openapi-generator.tech

Do not edit the class manually.
"""

"""
Attributes:
openapi_types (dict): The key is attribute name
and the value is attribute type.
attribute_map (dict): The key is attribute name
and the value is json key in definition.
"""
openapi_types = {
'code': 'int',
'type': 'str',
'message': 'str'
}

attribute_map = {
'code': 'code',
'type': 'type',
'message': 'message'
}

def __init__(self, code=None, type=None, message=None, local_vars_configuration=None): # noqa: E501
"""ApiResponse - a model defined in OpenAPI""" # noqa: E501
if local_vars_configuration is None:
local_vars_configuration = Configuration.get_default_copy()
self.local_vars_configuration = local_vars_configuration

self._code = None
self._type = None
self._message = None
self.discriminator = None

if code is not None:
self.code = code
if type is not None:
self.type = type
if message is not None:
self.message = message

@property
def code(self):
"""Gets the code of this ApiResponse. # noqa: E501


:return: The code of this ApiResponse. # noqa: E501
:rtype: int
"""
return self._code

@code.setter
def code(self, code):
"""Sets the code of this ApiResponse.


:param code: The code of this ApiResponse. # noqa: E501
:type code: int
"""

self._code = code

@property
def type(self):
"""Gets the type of this ApiResponse. # noqa: E501


:return: The type of this ApiResponse. # noqa: E501
:rtype: str
"""
return self._type

@type.setter
def type(self, type):
"""Sets the type of this ApiResponse.


:param type: The type of this ApiResponse. # noqa: E501
:type type: str
"""

self._type = type

@property
def message(self):
"""Gets the message of this ApiResponse. # noqa: E501


:return: The message of this ApiResponse. # noqa: E501
:rtype: str
"""
return self._message

@message.setter
def message(self, message):
"""Sets the message of this ApiResponse.


:param message: The message of this ApiResponse. # noqa: E501
:type message: str
"""

self._message = message

def to_dict(self, serialize=False):
"""Returns the model properties as a dict"""
result = {}

def convert(x):
if hasattr(x, "to_dict"):
args = getfullargspec(x.to_dict).args
if len(args) == 1:
return x.to_dict()
else:
return x.to_dict(serialize)
else:
return x

for attr, _ in six.iteritems(self.openapi_types):
value = getattr(self, attr)
attr = self.attribute_map.get(attr, attr) if serialize else attr
if isinstance(value, list):
result[attr] = list(map(
lambda x: convert(x),
value
))
elif isinstance(value, dict):
result[attr] = dict(map(
lambda item: (item[0], convert(item[1])),
value.items()
))
else:
result[attr] = convert(value)

return result

def to_str(self):
"""Returns the string representation of the model"""
return pprint.pformat(self.to_dict())

def __repr__(self):
"""For `print` and `pprint`"""
return self.to_str()

def __eq__(self, other):
"""Returns true if both objects are equal"""
if not isinstance(other, ApiResponse):
return False

return self.to_dict() == other.to_dict()

def __ne__(self, other):
"""Returns true if both objects are not equal"""
if not isinstance(other, ApiResponse):
return True

return self.to_dict() != other.to_dict()
11 changes: 0 additions & 11 deletions samples/openapi3/client/petstore/python-legacy/docs/Client.md
Original file line number Diff line number Diff line change
@@ -1,11 +0,0 @@
# Client
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Marek00Malik could you please revert this file?



## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**client** | **str** | | [optional]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)


Original file line number Diff line number Diff line change
@@ -1,39 +0,0 @@
<?php
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Marek00Malik could you please revert this file?


namespace App;

use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;

class User extends Authenticatable
{
use Notifiable;

/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'name', 'email', 'password',
];

/**
* The attributes that should be hidden for arrays.
*
* @var array
*/
protected $hidden = [
'password', 'remember_token',
];

/**
* The attributes that should be cast to native types.
*
* @var array
*/
protected $casts = [
'email_verified_at' => 'datetime',
];
}