Skip to content

Bump libraries for Kotlin client. #20053

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Bump libraries for Kotlin client. #20053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,12 +863,6 @@ private void processMultiplatformLibrary(final String infrastructureFolder) {
supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.kt.mustache", authFolder, "HttpBasicAuth.kt"));
supportingFiles.add(new SupportingFile("auth/HttpBearerAuth.kt.mustache", authFolder, "HttpBearerAuth.kt"));
supportingFiles.add(new SupportingFile("auth/OAuth.kt.mustache", authFolder, "OAuth.kt"));

// multiplatform specific testing files
supportingFiles.add(new SupportingFile("commonTest/Coroutine.kt.mustache", "src/commonTest/kotlin/util", "Coroutine.kt"));
supportingFiles.add(new SupportingFile("iosTest/Coroutine.kt.mustache", "src/iosTest/kotlin/util", "Coroutine.kt"));
supportingFiles.add(new SupportingFile("jsTest/Coroutine.kt.mustache", "src/jsTest/kotlin/util", "Coroutine.kt"));
supportingFiles.add(new SupportingFile("jvmTest/Coroutine.kt.mustache", "src/jvmTest/kotlin/util", "Coroutine.kt"));
}


Expand Down
2 changes: 0 additions & 2 deletions ...erator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package {{packageName}}.auth

import io.ktor.util.InternalAPI
import io.ktor.util.encodeBase64

{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}class HttpBasicAuth : Authentication {
{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}var username: String? = null
{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}var password: String? = null

@OptIn(InternalAPI::class)
override fun apply(query: MutableMap<String, List<String>>, headers: MutableMap<String, String>) {
if (username == null && password == null) return
val str = (username ?: "") + ":" + (password ?: "")
Expand Down
2 changes: 0 additions & 2 deletions ...r/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package {{packageName}}.auth

import io.ktor.util.InternalAPI
import io.ktor.util.encodeBase64

{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}class HttpBasicAuth : Authentication {
{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}var username: String? = null
{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}var password: String? = null

@OptIn(InternalAPI::class)
override fun apply(query: MutableMap<String, List<String>>, headers: MutableMap<String, String>) {
if (username == null && password == null) return
val str = (username ?: "") + ":" + (password ?: "")
Expand Down
12 changes: 6 additions & 6 deletions ...erator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget

plugins {
kotlin("multiplatform"){{^omitGradlePluginVersions}} version "1.9.20" // kotlin_version{{/omitGradlePluginVersions}}
kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "1.9.20" // kotlin_version{{/omitGradlePluginVersions}}
kotlin("multiplatform"){{^omitGradlePluginVersions}} version "2.0.21" // kotlin_version{{/omitGradlePluginVersions}}
kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "2.0.21" // kotlin_version{{/omitGradlePluginVersions}}
}

group = "{{groupId}}"
version = "{{artifactVersion}}"

val kotlin_version = "1.9.20"
val coroutines_version = "1.7.3"
val serialization_version = "1.6.1"
val ktor_version = "2.3.6"
val kotlin_version = "2.0.21"
val coroutines_version = "1.9.0"
val serialization_version = "1.7.3"
val ktor_version = "3.0.1"

repositories {
mavenCentral()
Expand Down
13 changes: 0 additions & 13 deletions ...src/main/resources/kotlin-client/libraries/multiplatform/commonTest/Coroutine.kt.mustache
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...or/src/main/resources/kotlin-client/libraries/multiplatform/iosTest/Coroutine.kt.mustache
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...tor/src/main/resources/kotlin-client/libraries/multiplatform/jsTest/Coroutine.kt.mustache
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...or/src/main/resources/kotlin-client/libraries/multiplatform/jvmTest/Coroutine.kt.mustache
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,3 @@ src/commonMain/kotlin/org/openapitools/client/infrastructure/OctetByteArray.kt
src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
src/commonTest/kotlin/util/Coroutine.kt
src/iosTest/kotlin/util/Coroutine.kt
src/jsTest/kotlin/util/Coroutine.kt
src/jvmTest/kotlin/util/Coroutine.kt
12 changes: 6 additions & 6 deletions samples/client/petstore/kotlin-array-simple-string-multiplatform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget

plugins {
kotlin("multiplatform") version "1.9.20" // kotlin_version
kotlin("plugin.serialization") version "1.9.20" // kotlin_version
kotlin("multiplatform") version "2.0.21" // kotlin_version
kotlin("plugin.serialization") version "2.0.21" // kotlin_version
}

group = "org.openapitools"
version = "1.0.0"

val kotlin_version = "1.9.20"
val coroutines_version = "1.7.3"
val serialization_version = "1.6.1"
val ktor_version = "2.3.6"
val kotlin_version = "2.0.21"
val coroutines_version = "1.9.0"
val serialization_version = "1.7.3"
val ktor_version = "3.0.1"

repositories {
mavenCentral()
Expand Down
2 changes: 0 additions & 2 deletions ...-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package org.openapitools.client.auth

import io.ktor.util.InternalAPI
import io.ktor.util.encodeBase64

class HttpBasicAuth : Authentication {
var username: String? = null
var password: String? = null

@OptIn(InternalAPI::class)
override fun apply(query: MutableMap<String, List<String>>, headers: MutableMap<String, String>) {
if (username == null && password == null) return
val str = (username ?: "") + ":" + (password ?: "")
Expand Down
27 changes: 0 additions & 27 deletions ...petstore/kotlin-array-simple-string-multiplatform/src/commonTest/kotlin/util/Coroutine.kt
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ...nt/petstore/kotlin-array-simple-string-multiplatform/src/iosTest/kotlin/util/Coroutine.kt
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...ent/petstore/kotlin-array-simple-string-multiplatform/src/jsTest/kotlin/util/Coroutine.kt
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ...nt/petstore/kotlin-array-simple-string-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,3 @@ src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
src/commonMain/kotlin/org/openapitools/client/models/Apa.kt
src/commonTest/kotlin/util/Coroutine.kt
src/iosTest/kotlin/util/Coroutine.kt
src/jsTest/kotlin/util/Coroutine.kt
src/jvmTest/kotlin/util/Coroutine.kt
12 changes: 6 additions & 6 deletions samples/client/petstore/kotlin-bigdecimal-default-multiplatform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget

plugins {
kotlin("multiplatform") version "1.9.20" // kotlin_version
kotlin("plugin.serialization") version "1.9.20" // kotlin_version
kotlin("multiplatform") version "2.0.21" // kotlin_version
kotlin("plugin.serialization") version "2.0.21" // kotlin_version
}

group = "org.openapitools"
version = "1.0.0"

val kotlin_version = "1.9.20"
val coroutines_version = "1.7.3"
val serialization_version = "1.6.1"
val ktor_version = "2.3.6"
val kotlin_version = "2.0.21"
val coroutines_version = "1.9.0"
val serialization_version = "1.7.3"
val ktor_version = "3.0.1"

repositories {
mavenCentral()
Expand Down
2 changes: 0 additions & 2 deletions ...default-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package org.openapitools.client.auth

import io.ktor.util.InternalAPI
import io.ktor.util.encodeBase64

class HttpBasicAuth : Authentication {
var username: String? = null
var password: String? = null

@OptIn(InternalAPI::class)
override fun apply(query: MutableMap<String, List<String>>, headers: MutableMap<String, String>) {
if (username == null && password == null) return
val str = (username ?: "") + ":" + (password ?: "")
Expand Down
27 changes: 0 additions & 27 deletions .../petstore/kotlin-bigdecimal-default-multiplatform/src/commonTest/kotlin/util/Coroutine.kt
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ...ent/petstore/kotlin-bigdecimal-default-multiplatform/src/iosTest/kotlin/util/Coroutine.kt
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...ient/petstore/kotlin-bigdecimal-default-multiplatform/src/jsTest/kotlin/util/Coroutine.kt
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ...ent/petstore/kotlin-bigdecimal-default-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,3 @@ src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
src/commonMain/kotlin/org/openapitools/client/models/Apa.kt
src/commonTest/kotlin/util/Coroutine.kt
src/iosTest/kotlin/util/Coroutine.kt
src/jsTest/kotlin/util/Coroutine.kt
src/jvmTest/kotlin/util/Coroutine.kt
12 changes: 6 additions & 6 deletions samples/client/petstore/kotlin-default-values-multiplatform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget

plugins {
kotlin("multiplatform") version "1.9.20" // kotlin_version
kotlin("plugin.serialization") version "1.9.20" // kotlin_version
kotlin("multiplatform") version "2.0.21" // kotlin_version
kotlin("plugin.serialization") version "2.0.21" // kotlin_version
}

group = "org.openapitools"
version = "1.0.0"

val kotlin_version = "1.9.20"
val coroutines_version = "1.7.3"
val serialization_version = "1.6.1"
val ktor_version = "2.3.6"
val kotlin_version = "2.0.21"
val coroutines_version = "1.9.0"
val serialization_version = "1.7.3"
val ktor_version = "3.0.1"

repositories {
mavenCentral()
Expand Down
Loading
Loading