-
-
Notifications
You must be signed in to change notification settings - Fork 7.5k
[Kotlin Multiplatform] Update and fixes for Kotlin 1.5.10 and Kotlinx.serialization 1.2.1 #9755
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.
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
wing328
merged 6 commits into
OpenAPITools:master
from
837:refactor/update-kotlin-multiplatform
Jul 3, 2021
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2538f84
Update Kotlin Multiplatform with Kotlin 1.5.10, Ktor 1.6.0 and Kotlin…
DevSrSouza 67a9698
update samples and documentation
3243ead
PR Review changes
837 d71aa07
remove const from JSON_DEFAULT
24b7d61
Merge branch 'master' into refactor/update-kotlin-multiplatform
837 2040de5
Update AbstractKotlinCodegen.java
837 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
...erator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| 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 | ||
| } | ||
|
|
||
| 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" | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| kotlin { | ||
| jvm() | ||
| ios { binaries { framework { freeCompilerArgs += "-Xobjc-generics" } } } | ||
| js { | ||
| browser() | ||
| nodejs() | ||
| } | ||
|
|
||
| sourceSets { | ||
| val commonMain by getting { | ||
| dependencies { | ||
| implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version") | ||
| implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version") | ||
| api("io.ktor:ktor-client-core:$ktor_version") | ||
| api("io.ktor:ktor-client-json:$ktor_version") | ||
| api("io.ktor:ktor-client-serialization:$ktor_version") | ||
| } | ||
| } | ||
|
|
||
| val commonTest by getting { | ||
| dependencies { | ||
| implementation(kotlin("test")) | ||
| implementation("io.ktor:ktor-client-mock:$ktor_version") | ||
| } | ||
| } | ||
|
|
||
| val jvmMain by getting { | ||
| dependencies { | ||
| implementation(kotlin("stdlib-jdk7")) | ||
| } | ||
| } | ||
|
|
||
| val jvmTest by getting { | ||
| dependencies { | ||
| implementation(kotlin("test-junit")) | ||
| } | ||
| } | ||
|
|
||
| val iosMain by getting { | ||
| dependencies { | ||
| api("io.ktor:ktor-client-ios:$ktor_version") | ||
| } | ||
| } | ||
|
|
||
| val iosTest by getting | ||
|
|
||
| val jsMain by getting { | ||
| dependencies { | ||
| api("io.ktor:ktor-client-js:$ktor_version") | ||
| } | ||
| } | ||
|
|
||
| val jsTest by getting | ||
|
|
||
| all { | ||
| languageSettings.apply { | ||
| useExperimentalAnnotation("kotlin.Experimental") | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| tasks { | ||
| register("iosTest") { | ||
| val device = project.findProperty("device")?.toString() ?: "iPhone 8" | ||
| dependsOn("linkDebugTestIosX64") | ||
| group = JavaBasePlugin.VERIFICATION_GROUP | ||
| description = "Execute unit tests on ${device} simulator" | ||
| doLast { | ||
| val binary = kotlin.targets.getByName<KotlinNativeTarget>("iosX64").binaries.getTest("DEBUG") | ||
| exec { | ||
| commandLine("xcrun", "simctl", "spawn", device, binary.outputFile) | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.