loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 14:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin multiplatform updated to fit future Kotlin 1.6.0 release (#10468)

Browse Source 
* Update Kotlin Version to 1.6.0-M1
Update Multiplatform Plugin to 1.6.0-M1
Update Gragle to 7.2
Update AGP to 7.0.2

Update samples accordingle

Resolve: https://github.com/OpenAPITools/openapi-generator/issues/10467

* Removes local.properties from kotlin-multiplatform petstore client, that was accidentally added

* Use the latest kotlin stable version 1.5.31

* update samples

Co-authored-by: William Cheng <wing328hk@gmail.com>
This commit is contained in:
Fabio Bombardi 2021-10-13 09:56:28 +02:00 committed by GitHub
parent 34f475f7f7
commit ae86ff7aaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache vendored
View File

@ -7,7 +7,7 @@ class HttpBasicAuth : Authentication {
var username: String? = null var username: String? = null
var password: String? = null var password: String? = null
@InternalAPI @OptIn(InternalAPI::class)
override fun apply(query: MutableMap<String, List<String>>, headers: MutableMap<String, String>) { override fun apply(query: MutableMap<String, List<String>>, headers: MutableMap<String, String>) {
if (username == null && password == null) return if (username == null && password == null) return
val str = (username ?: "") + ":" + (password ?: "") val str = (username ?: "") + ":" + (password ?: "")

5
samples/client/petstore/kotlin-multiplatform/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,6 @@
#Fri Sep 24 10:59:07 CEST 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

2
samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
View File

@ -7,7 +7,7 @@ class HttpBasicAuth : Authentication {
var username: String? = null var username: String? = null
var password: String? = null var password: String? = null
@InternalAPI @OptIn(InternalAPI::class)
override fun apply(query: MutableMap<String, List<String>>, headers: MutableMap<String, String>) { override fun apply(query: MutableMap<String, List<String>>, headers: MutableMap<String, String>) {
if (username == null && password == null) return if (username == null && password == null) return
val str = (username ?: "") + ":" + (password ?: "") val str = (username ?: "") + ":" + (password ?: "")