From b811e80aa1459f7b77b6c8a9edd96a3e036b5d09 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 16 Oct 2024 11:39:52 +0200 Subject: [PATCH 1/5] FIX import for Ktor's InternalApi import fix-issue-19447-invalid-ktor-internalapi-import --- .../libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache | 2 +- .../libraries/multiplatform/auth/HttpBasicAuth.kt.mustache | 2 +- .../kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- .../kotlin/org/openapitools/client/auth/HttpBasicAuth.kt | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache index 26325424e5dd..73cc49edad0e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache @@ -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 { diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache index 26325424e5dd..73cc49edad0e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache @@ -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 { diff --git a/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-default-values-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-default-values-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-default-values-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-default-values-multiplatform/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 40276dbb985e..35c5d79eb17f 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt index 5f0a52c19515..29381038321a 100644 --- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt +++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt @@ -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 { From f252ad06628a1ca68c7495f635decf5b2994ff6d Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 16 Oct 2024 12:06:12 +0200 Subject: [PATCH 2/5] UPDATE ktor to 3.0.0 for kotlin samples fix-issue-19447-invalid-ktor-internalapi-import --- .../kotlin-array-simple-string-multiplatform/build.gradle.kts | 2 +- .../kotlin-bigdecimal-default-multiplatform/build.gradle.kts | 2 +- .../kotlin-default-values-multiplatform/build.gradle.kts | 2 +- .../kotlin-multiplatform-kotlinx-datetime/build.gradle.kts | 2 +- samples/client/petstore/kotlin-multiplatform/build.gradle.kts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/client/petstore/kotlin-array-simple-string-multiplatform/build.gradle.kts b/samples/client/petstore/kotlin-array-simple-string-multiplatform/build.gradle.kts index 60a1d4bbf117..02fd7dbee3c8 100644 --- a/samples/client/petstore/kotlin-array-simple-string-multiplatform/build.gradle.kts +++ b/samples/client/petstore/kotlin-array-simple-string-multiplatform/build.gradle.kts @@ -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() diff --git a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/build.gradle.kts b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/build.gradle.kts index 60a1d4bbf117..02fd7dbee3c8 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/build.gradle.kts +++ b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/build.gradle.kts @@ -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() diff --git a/samples/client/petstore/kotlin-default-values-multiplatform/build.gradle.kts b/samples/client/petstore/kotlin-default-values-multiplatform/build.gradle.kts index 60a1d4bbf117..02fd7dbee3c8 100644 --- a/samples/client/petstore/kotlin-default-values-multiplatform/build.gradle.kts +++ b/samples/client/petstore/kotlin-default-values-multiplatform/build.gradle.kts @@ -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() diff --git a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/build.gradle.kts b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/build.gradle.kts index 60a1d4bbf117..02fd7dbee3c8 100644 --- a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/build.gradle.kts +++ b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/build.gradle.kts @@ -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() diff --git a/samples/client/petstore/kotlin-multiplatform/build.gradle.kts b/samples/client/petstore/kotlin-multiplatform/build.gradle.kts index 60a1d4bbf117..02fd7dbee3c8 100644 --- a/samples/client/petstore/kotlin-multiplatform/build.gradle.kts +++ b/samples/client/petstore/kotlin-multiplatform/build.gradle.kts @@ -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() From 2bafe858bce33600cd043a3afafe539fde6bffbb Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 16 Oct 2024 12:41:12 +0200 Subject: [PATCH 3/5] FIX update ktor to 3.0.0 in .mustache fix-issue-19447-invalid-ktor-internalapi-import --- .../libraries/multiplatform/build.gradle.kts.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache index e527fb53d363..953b0fdd1a2b 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache @@ -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() From 699560c87c0f07cd321c9134b22db3a20377b549 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 16 Oct 2024 15:15:29 +0200 Subject: [PATCH 4/5] FIX update another ktor-client to 3.0.0 in .mustache fix-issue-19447-invalid-ktor-internalapi-import --- .../src/main/resources/kotlin-client/build.gradle.mustache | 2 +- samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle | 2 +- samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle | 2 +- .../petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache index 1dfe6fd0636f..7b9cad31d56b 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache @@ -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' diff --git a/samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle b/samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle index 21819e84790c..10a02ba7a4ef 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle +++ b/samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle @@ -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 { diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle b/samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle index c308a9bc68f8..eb571409aa0d 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle @@ -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 { diff --git a/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle b/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle index 126b859fb7b1..83fe68093ec8 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle +++ b/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle @@ -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 { From 8efeb4d2ebcfef5259fed77ef1c380d425e1aa07 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 16 Oct 2024 15:44:59 +0200 Subject: [PATCH 5/5] FIX update kotlin-multiplatform ktor-client to 3.0.0 in .gradle fix-issue-19447-invalid-ktor-internalapi-import --- .../openapi3/client/petstore/kotlin-multiplatform/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/build.gradle b/samples/openapi3/client/petstore/kotlin-multiplatform/build.gradle index 6e41c14fece0..32bdc4cb525f 100644 --- a/samples/openapi3/client/petstore/kotlin-multiplatform/build.gradle +++ b/samples/openapi3/client/petstore/kotlin-multiplatform/build.gradle @@ -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 {