Skip to content

Commit 3a36882

Browse files
Bump libraries for Kotlin-client. (#20053)
1 parent 00db84d commit 3a36882

File tree

52 files changed

+37
-579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+37
-579
lines changed

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -863,12 +863,6 @@ private void processMultiplatformLibrary(final String infrastructureFolder) {
863863
supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.kt.mustache", authFolder, "HttpBasicAuth.kt"));
864864
supportingFiles.add(new SupportingFile("auth/HttpBearerAuth.kt.mustache", authFolder, "HttpBearerAuth.kt"));
865865
supportingFiles.add(new SupportingFile("auth/OAuth.kt.mustache", authFolder, "OAuth.kt"));
866-
867-
// multiplatform specific testing files
868-
supportingFiles.add(new SupportingFile("commonTest/Coroutine.kt.mustache", "src/commonTest/kotlin/util", "Coroutine.kt"));
869-
supportingFiles.add(new SupportingFile("iosTest/Coroutine.kt.mustache", "src/iosTest/kotlin/util", "Coroutine.kt"));
870-
supportingFiles.add(new SupportingFile("jsTest/Coroutine.kt.mustache", "src/jsTest/kotlin/util", "Coroutine.kt"));
871-
supportingFiles.add(new SupportingFile("jvmTest/Coroutine.kt.mustache", "src/jvmTest/kotlin/util", "Coroutine.kt"));
872866
}
873867

874868

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package {{packageName}}.auth
22

3-
import io.ktor.util.InternalAPI
43
import io.ktor.util.encodeBase64
54

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

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

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package {{packageName}}.auth
22

3-
import io.ktor.util.InternalAPI
43
import io.ktor.util.encodeBase64
54

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

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

modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
22

33
plugins {
4-
kotlin("multiplatform"){{^omitGradlePluginVersions}} version "1.9.20" // kotlin_version{{/omitGradlePluginVersions}}
5-
kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "1.9.20" // kotlin_version{{/omitGradlePluginVersions}}
4+
kotlin("multiplatform"){{^omitGradlePluginVersions}} version "2.0.21" // kotlin_version{{/omitGradlePluginVersions}}
5+
kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "2.0.21" // kotlin_version{{/omitGradlePluginVersions}}
66
}
77

88
group = "{{groupId}}"
99
version = "{{artifactVersion}}"
1010

11-
val kotlin_version = "1.9.20"
12-
val coroutines_version = "1.7.3"
13-
val serialization_version = "1.6.1"
14-
val ktor_version = "2.3.6"
11+
val kotlin_version = "2.0.21"
12+
val coroutines_version = "1.9.0"
13+
val serialization_version = "1.7.3"
14+
val ktor_version = "3.0.1"
1515

1616
repositories {
1717
mavenCentral()

modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/commonTest/Coroutine.kt.mustache

Lines changed: 0 additions & 13 deletions
This file was deleted.

modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/iosTest/Coroutine.kt.mustache

Lines changed: 0 additions & 8 deletions
This file was deleted.

modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/jsTest/Coroutine.kt.mustache

Lines changed: 0 additions & 7 deletions
This file was deleted.

modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/jvmTest/Coroutine.kt.mustache

Lines changed: 0 additions & 8 deletions
This file was deleted.

samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/FILES

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,3 @@ src/commonMain/kotlin/org/openapitools/client/infrastructure/OctetByteArray.kt
2121
src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt
2222
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
2323
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
24-
src/commonTest/kotlin/util/Coroutine.kt
25-
src/iosTest/kotlin/util/Coroutine.kt
26-
src/jsTest/kotlin/util/Coroutine.kt
27-
src/jvmTest/kotlin/util/Coroutine.kt

samples/client/petstore/kotlin-array-simple-string-multiplatform/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
22

33
plugins {
4-
kotlin("multiplatform") version "1.9.20" // kotlin_version
5-
kotlin("plugin.serialization") version "1.9.20" // kotlin_version
4+
kotlin("multiplatform") version "2.0.21" // kotlin_version
5+
kotlin("plugin.serialization") version "2.0.21" // kotlin_version
66
}
77

88
group = "org.openapitools"
99
version = "1.0.0"
1010

11-
val kotlin_version = "1.9.20"
12-
val coroutines_version = "1.7.3"
13-
val serialization_version = "1.6.1"
14-
val ktor_version = "2.3.6"
11+
val kotlin_version = "2.0.21"
12+
val coroutines_version = "1.9.0"
13+
val serialization_version = "1.7.3"
14+
val ktor_version = "3.0.1"
1515

1616
repositories {
1717
mavenCentral()

samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package org.openapitools.client.auth
22

3-
import io.ktor.util.InternalAPI
43
import io.ktor.util.encodeBase64
54

65
class HttpBasicAuth : Authentication {
76
var username: String? = null
87
var password: String? = null
98

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

samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonTest/kotlin/util/Coroutine.kt

Lines changed: 0 additions & 27 deletions
This file was deleted.

samples/client/petstore/kotlin-array-simple-string-multiplatform/src/iosTest/kotlin/util/Coroutine.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

samples/client/petstore/kotlin-array-simple-string-multiplatform/src/jsTest/kotlin/util/Coroutine.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

samples/client/petstore/kotlin-array-simple-string-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/FILES

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,3 @@ src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt
2323
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
2424
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
2525
src/commonMain/kotlin/org/openapitools/client/models/Apa.kt
26-
src/commonTest/kotlin/util/Coroutine.kt
27-
src/iosTest/kotlin/util/Coroutine.kt
28-
src/jsTest/kotlin/util/Coroutine.kt
29-
src/jvmTest/kotlin/util/Coroutine.kt

samples/client/petstore/kotlin-bigdecimal-default-multiplatform/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
22

33
plugins {
4-
kotlin("multiplatform") version "1.9.20" // kotlin_version
5-
kotlin("plugin.serialization") version "1.9.20" // kotlin_version
4+
kotlin("multiplatform") version "2.0.21" // kotlin_version
5+
kotlin("plugin.serialization") version "2.0.21" // kotlin_version
66
}
77

88
group = "org.openapitools"
99
version = "1.0.0"
1010

11-
val kotlin_version = "1.9.20"
12-
val coroutines_version = "1.7.3"
13-
val serialization_version = "1.6.1"
14-
val ktor_version = "2.3.6"
11+
val kotlin_version = "2.0.21"
12+
val coroutines_version = "1.9.0"
13+
val serialization_version = "1.7.3"
14+
val ktor_version = "3.0.1"
1515

1616
repositories {
1717
mavenCentral()

samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package org.openapitools.client.auth
22

3-
import io.ktor.util.InternalAPI
43
import io.ktor.util.encodeBase64
54

65
class HttpBasicAuth : Authentication {
76
var username: String? = null
87
var password: String? = null
98

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

samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonTest/kotlin/util/Coroutine.kt

Lines changed: 0 additions & 27 deletions
This file was deleted.

samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/iosTest/kotlin/util/Coroutine.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/jsTest/kotlin/util/Coroutine.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/FILES

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,3 @@ src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt
2323
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
2424
src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
2525
src/commonMain/kotlin/org/openapitools/client/models/Apa.kt
26-
src/commonTest/kotlin/util/Coroutine.kt
27-
src/iosTest/kotlin/util/Coroutine.kt
28-
src/jsTest/kotlin/util/Coroutine.kt
29-
src/jvmTest/kotlin/util/Coroutine.kt

samples/client/petstore/kotlin-default-values-multiplatform/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
22

33
plugins {
4-
kotlin("multiplatform") version "1.9.20" // kotlin_version
5-
kotlin("plugin.serialization") version "1.9.20" // kotlin_version
4+
kotlin("multiplatform") version "2.0.21" // kotlin_version
5+
kotlin("plugin.serialization") version "2.0.21" // kotlin_version
66
}
77

88
group = "org.openapitools"
99
version = "1.0.0"
1010

11-
val kotlin_version = "1.9.20"
12-
val coroutines_version = "1.7.3"
13-
val serialization_version = "1.6.1"
14-
val ktor_version = "2.3.6"
11+
val kotlin_version = "2.0.21"
12+
val coroutines_version = "1.9.0"
13+
val serialization_version = "1.7.3"
14+
val ktor_version = "3.0.1"
1515

1616
repositories {
1717
mavenCentral()

0 commit comments

Comments
 (0)