loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Kotlin][Multiplatform] Fix Kotlin Multiplatform Test (#10900)

Browse Source 
* Fix Kotlin Multiplatform Test

- Remove obsolete 'GRADLE_METADATA' Gradle preview flag from
Kotlin Multiplatform settings.gradle template file.
- Update Kotlin Version to 1.5.31
- Update coroutines, serialization and Ktor versions to the versions
recommended for usage with Kotlin 1.5.31
see https://kotlinlang.org/docs/releases.html#release-details .

Fixes https://github.com/OpenAPITools/openapi-generator/issues/10898

* Add 'clean' task to pom.mustache and reformat sample pom.xml

* Use stable 1.3.0 version of Kotlin serialization
This commit is contained in:
Tal Kirshboim 2021-11-20 02:30:26 +01:00 committed by GitHub
parent 126e406193
commit eeb00e27d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,17 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
plugins {
kotlin("multiplatform") version "1.5.10" // kotlin_version
kotlin("plugin.serialization") version "1.5.10" // kotlin_version
kotlin("multiplatform") version "1.5.31" // kotlin_version
kotlin("plugin.serialization") version "1.5.31" // kotlin_version
}
group = "{{groupId}}"
version = "{{artifactVersion}}"
val kotlin_version = "1.5.10"
val coroutines_version = "1.5.0"
val serialization_version = "1.2.1"
val ktor_version = "1.6.0"
val kotlin_version = "1.5.31"
val coroutines_version = "1.5.2"
val serialization_version = "1.3.0"
val ktor_version = "1.6.3"
repositories {
mavenCentral()

14
modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/pom.mustache vendored
View File

@ -26,6 +26,20 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions>
<execution>
<id>bundle-clean</id>
<phase>clean</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>/bin/bash</executable>
<arguments>
<argument>gradlew</argument>
<argument>clean</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>bundle-test</id>
<phase>integration-test</phase>

1
modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/settings.gradle.kts.mustache vendored
View File

@ -1,2 +1 @@
enableFeaturePreview("GRADLE_METADATA")
rootProject.name = "{{artifactId}}"

12
samples/client/petstore/kotlin-multiplatform/build.gradle.kts
View File

@ -1,17 +1,17 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
plugins {
kotlin("multiplatform") version "1.5.10" // kotlin_version
kotlin("plugin.serialization") version "1.5.10" // kotlin_version
kotlin("multiplatform") version "1.5.31" // kotlin_version
kotlin("plugin.serialization") version "1.5.31" // kotlin_version
}
group = "org.openapitools"
version = "1.0.0"
val kotlin_version = "1.5.10"
val coroutines_version = "1.5.0"
val serialization_version = "1.2.1"
val ktor_version = "1.6.0"
val kotlin_version = "1.5.31"
val coroutines_version = "1.5.2"
val serialization_version = "1.3.0"
val ktor_version = "1.6.3"
repositories {
mavenCentral()

14
samples/client/petstore/kotlin-multiplatform/pom.xml
View File

@ -26,6 +26,20 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions>
<execution>
<id>bundle-clean</id>
<phase>clean</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>/bin/bash</executable>
<arguments>
<argument>gradlew</argument>
<argument>clean</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>bundle-test</id>
<phase>integration-test</phase>

1
samples/client/petstore/kotlin-multiplatform/settings.gradle.kts
View File

@ -1,2 +1 @@
enableFeaturePreview("GRADLE_METADATA")
rootProject.name = "kotlin-client-petstore-multiplatform"