Skip to content

UPDATE ktor-client to 3.0.0 and fix HttpBasicAuth.kt to support it #19886

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

UPDATE ktor-client to 3.0.0 and fix HttpBasicAuth.kt to support it #19886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b811e80
FIX import for Ktor's InternalApi import
ninovanhooff Oct 16, 2024
f252ad0
UPDATE ktor to 3.0.0 for kotlin samples
ninovanhooff Oct 16, 2024
2bafe85
FIX update ktor to 3.0.0 in .mustache
ninovanhooff Oct 16, 2024
699560c
FIX update another ktor-client to 3.0.0 in .mustache
ninovanhooff Oct 16, 2024
8efeb4d
FIX update kotlin-multiplatform ktor-client to 3.0.0 in .gradle
ninovanhooff Oct 16, 2024
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
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ wrapper {
buildscript {
ext.kotlin_version = '1.9.23'
{{#jvm-ktor}}
ext.ktor_version = '2.3.9'
ext.ktor_version = '3.0.0'
{{/jvm-ktor}}
{{#jvm-retrofit2}}
ext.retrofitVersion = '2.10.0'
Expand Down
2 changes: 1 addition & 1 deletion ...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,6 +1,6 @@
package {{packageName}}.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion ...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,6 +1,6 @@
package {{packageName}}.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion ...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
Expand Up @@ -11,7 +11,7 @@ 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 ktor_version = "3.0.0"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Up @@ -11,7 +11,7 @@ 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 ktor_version = "3.0.0"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion ...-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,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion ...simple-string-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Up @@ -11,7 +11,7 @@ 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 ktor_version = "3.0.0"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion ...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,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion ...cimal-default-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Up @@ -11,7 +11,7 @@ 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 ktor_version = "3.0.0"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion ...-values-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,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion ...efault-values-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wrapper {

buildscript {
ext.kotlin_version = '1.9.23'
ext.ktor_version = '2.3.9'
ext.ktor_version = '3.0.0'
ext.spotless_version = "6.25.0"

repositories {
Expand Down
2 changes: 1 addition & 1 deletion ...tstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wrapper {

buildscript {
ext.kotlin_version = '1.9.23'
ext.ktor_version = '2.3.9'
ext.ktor_version = '3.0.0'
ext.spotless_version = "6.25.0"

repositories {
Expand Down
2 changes: 1 addition & 1 deletion ...ore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wrapper {

buildscript {
ext.kotlin_version = '1.9.23'
ext.ktor_version = '2.3.9'
ext.ktor_version = '3.0.0'
ext.spotless_version = "6.25.0"

repositories {
Expand Down
2 changes: 1 addition & 1 deletion ...-ktor-kotlinx_serialization/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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 ktor_version = "3.0.0"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion ...form-kotlinx-datetime/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,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/kotlin-multiplatform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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 ktor_version = "3.0.0"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion .../kotlin-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,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/kotlin-multiplatform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ext {
kotlinx_version = '1.1.0'
coroutines_version = '1.3.1'
serialization_version = '0.12.0'
ktor_version = '1.2.4'
ktor_version = '3.0.0'
}

buildscript {
Expand Down
2 changes: 1 addition & 1 deletion .../kotlin-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,6 +1,6 @@
package org.openapitools.client.auth

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

class HttpBasicAuth : Authentication {
Expand Down
Loading