[Kotlin Multiplatform] Update and fixes #9232
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ | |
| * Gradle 6.8.3 | ||
| {{/jvm}} | ||
| {{#multiplatform}} | ||
| * Kotlin 1.4.32 | ||
| {{/multiplatform}} | ||
|
|
||
| ## Build | ||
|
|
||
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
| 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.4.32" // kotlin_version | ||
| kotlin("plugin.serialization") version "1.4.32" // kotlin_version | ||
| } | ||
|
|
||
| group = "{{groupId}}" | ||
| version = "{{artifactVersion}}" | ||
|
|
||
| val kotlin_version = "1.4.32" | ||
| val coroutines_version = "1.3.8" | ||
| val serialization_version = "1.1.0" | ||
| val ktor_version = "1.5.3" | ||
|
|
||
| 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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@DevSrSouza I would suggest file a separate PR for this particular change.
What about adding an option to let user choose between gradle build and Kotlin DSL as I could imagine not every users want Kotlin DSL?