azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update kotlin gradle plugin version in HMPP tests

Browse Source
This commit is contained in:
Andrey Uskov
2019-09-23 11:55:18 +03:00
parent ed750f4d10
commit ca75aeb534
4 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt
+56 -57
View File
@@ -10,7 +10,6 @@ import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.platform.js.JsPlatform
import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.js.JsPlatforms
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.platform.konan.KonanPlatforms import org.jetbrains.kotlin.platform.konan.KonanPlatforms
@@ -19,7 +18,7 @@ import org.junit.Before
import org.junit.Test import org.junit.Test
class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() { class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
//TODO support testing multiple gradle plugins versions private fun kotlinVersion() = if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) "1.3.50" else gradleKotlinPluginVersion
override fun isApplicableTest(): Boolean { override fun isApplicableTest(): Boolean {
return !gradleVersion.startsWith("3.") return !gradleVersion.startsWith("3.")
@@ -64,7 +63,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.commonMain") { module("project.my-app.commonMain") {
isHMPP(true) isHMPP(true)
targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16, KonanPlatforms.defaultKonanPlatform) targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16, KonanPlatforms.defaultKonanPlatform)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE)
sourceFolder("src/commonMain/kotlin", SourceKotlinRootType) sourceFolder("src/commonMain/kotlin", SourceKotlinRootType)
sourceFolder("src/commonMain/resources", ResourceKotlinRootType) sourceFolder("src/commonMain/resources", ResourceKotlinRootType)
} }
@@ -72,9 +71,9 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.commonTest") { module("project.my-app.commonTest") {
isHMPP(true) isHMPP(true)
targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16, KonanPlatforms.defaultKonanPlatform) targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16, KonanPlatforms.defaultKonanPlatform)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST)
moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST)
sourceFolder("src/commonTest/kotlin", TestSourceKotlinRootType) sourceFolder("src/commonTest/kotlin", TestSourceKotlinRootType)
sourceFolder("src/commonTest/resources", TestResourceKotlinRootType) sourceFolder("src/commonTest/resources", TestResourceKotlinRootType)
@@ -83,8 +82,8 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.jsMain") { module("project.my-app.jsMain") {
isHMPP(true) isHMPP(true)
targetPlatform(JsPlatforms.defaultJsPlatform) targetPlatform(JsPlatforms.defaultJsPlatform)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50-dev-1383", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${kotlinVersion()}", DependencyScope.COMPILE)
moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE)
moduleDependency("project.my-app.jvmAndJsMain", DependencyScope.COMPILE) moduleDependency("project.my-app.jvmAndJsMain", DependencyScope.COMPILE)
moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.COMPILE) moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.COMPILE)
@@ -95,11 +94,11 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.jsTest") { module("project.my-app.jsTest") {
isHMPP(true) isHMPP(true)
targetPlatform(JsPlatforms.defaultJsPlatform) targetPlatform(JsPlatforms.defaultJsPlatform)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-js:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-js:${kotlinVersion()}", DependencyScope.TEST)
moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST)
moduleDependency("project.my-app.commonTest", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST)
moduleDependency("project.my-app.jsMain", DependencyScope.TEST) moduleDependency("project.my-app.jsMain", DependencyScope.TEST)
@@ -114,7 +113,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.jvmAndJsMain") { module("project.my-app.jvmAndJsMain") {
isHMPP(true) isHMPP(true)
targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16) targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE)
moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE)
sourceFolder("src/jvmAndJsMain/kotlin", SourceKotlinRootType) sourceFolder("src/jvmAndJsMain/kotlin", SourceKotlinRootType)
sourceFolder("src/jvmAndJsMain/resources", ResourceKotlinRootType) sourceFolder("src/jvmAndJsMain/resources", ResourceKotlinRootType)
@@ -123,9 +122,9 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.jvmAndJsTest") { module("project.my-app.jvmAndJsTest") {
isHMPP(true) isHMPP(true)
targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16) targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST)
moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST)
moduleDependency("project.my-app.commonTest", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST)
moduleDependency("project.my-app.jvmAndJsMain", DependencyScope.TEST) moduleDependency("project.my-app.jvmAndJsMain", DependencyScope.TEST)
@@ -136,8 +135,8 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.jvmMain") { module("project.my-app.jvmMain") {
isHMPP(true) isHMPP(true)
targetPlatform(JvmPlatforms.jvm16) targetPlatform(JvmPlatforms.jvm16)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.50-dev-1383", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.COMPILE)
libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.COMPILE)
moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE)
moduleDependency("project.my-app.jvmAndJsMain", DependencyScope.COMPILE) moduleDependency("project.my-app.jvmAndJsMain", DependencyScope.COMPILE)
@@ -150,12 +149,12 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
targetPlatform(JvmPlatforms.jvm16) targetPlatform(JvmPlatforms.jvm16)
libraryDependency("Gradle: junit:junit:4.12", DependencyScope.TEST) libraryDependency("Gradle: junit:junit:4.12", DependencyScope.TEST)
libraryDependency("Gradle: org.hamcrest:hamcrest-core:1.3", DependencyScope.TEST) libraryDependency("Gradle: org.hamcrest:hamcrest-core:1.3", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.TEST)
moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST)
moduleDependency("project.my-app.commonTest", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST)
@@ -169,7 +168,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.linuxAndJsMain") { module("project.my-app.linuxAndJsMain") {
isHMPP(true) isHMPP(true)
targetPlatform(JsPlatforms.defaultJsPlatform, KonanPlatforms.defaultKonanPlatform) targetPlatform(JsPlatforms.defaultJsPlatform, KonanPlatforms.defaultKonanPlatform)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE)
moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE)
sourceFolder("src/linuxAndJsMain/kotlin", SourceKotlinRootType) sourceFolder("src/linuxAndJsMain/kotlin", SourceKotlinRootType)
sourceFolder("src/linuxAndJsMain/resources", ResourceKotlinRootType) sourceFolder("src/linuxAndJsMain/resources", ResourceKotlinRootType)
@@ -180,9 +179,9 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
targetPlatform(JsPlatforms.defaultJsPlatform, KonanPlatforms.defaultKonanPlatform) targetPlatform(JsPlatforms.defaultJsPlatform, KonanPlatforms.defaultKonanPlatform)
sourceFolder("src/linuxAndJsTest/kotlin", TestSourceKotlinRootType) sourceFolder("src/linuxAndJsTest/kotlin", TestSourceKotlinRootType)
sourceFolder("src/linuxAndJsTest/resources", TestResourceKotlinRootType) sourceFolder("src/linuxAndJsTest/resources", TestResourceKotlinRootType)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST)
moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST)
moduleDependency("project.my-app.commonTest", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST)
moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.TEST) moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.TEST)
@@ -191,13 +190,13 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.linuxX64Main") { module("project.my-app.linuxX64Main") {
isHMPP(true) isHMPP(true)
targetPlatform(KonanPlatforms.defaultKonanPlatform) targetPlatform(KonanPlatforms.defaultKonanPlatform)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - builtin [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - builtin [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - iconv [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - iconv [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - linux [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - linux [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - posix [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - posix [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - stdlib", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - stdlib", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - zlib [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - zlib [linux_x64]", DependencyScope.PROVIDED)
moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE)
moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.COMPILE) moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.COMPILE)
sourceFolder("src/linuxX64Main/kotlin", SourceKotlinRootType) sourceFolder("src/linuxX64Main/kotlin", SourceKotlinRootType)
@@ -207,15 +206,15 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("project.my-app.linuxX64Test") { module("project.my-app.linuxX64Test") {
isHMPP(true) isHMPP(true)
targetPlatform(KonanPlatforms.defaultKonanPlatform) targetPlatform(KonanPlatforms.defaultKonanPlatform)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:1.3.50-dev-1383", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - builtin [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - builtin [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - iconv [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - iconv [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - linux [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - linux [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - posix [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - posix [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - stdlib", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - stdlib", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - zlib [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - zlib [linux_x64]", DependencyScope.PROVIDED)
moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST)
moduleDependency("project.my-app.commonTest", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST)
moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.TEST) moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.TEST)
@@ -311,12 +310,12 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
module("jvm-on-mpp.hmpp-mod-a.linuxX64Main") { module("jvm-on-mpp.hmpp-mod-a.linuxX64Main") {
moduleDependency("jvm-on-mpp.hmpp-mod-a.commonMain", DependencyScope.COMPILE) moduleDependency("jvm-on-mpp.hmpp-mod-a.commonMain", DependencyScope.COMPILE)
moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxAndJsMain", DependencyScope.COMPILE) moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxAndJsMain", DependencyScope.COMPILE)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - builtin [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - builtin [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - iconv [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - iconv [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - linux [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - linux [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - posix [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - posix [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - stdlib", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - stdlib", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - zlib [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - zlib [linux_x64]", DependencyScope.PROVIDED)
} }
module("jvm-on-mpp.hmpp-mod-a.linuxX64Test") { module("jvm-on-mpp.hmpp-mod-a.linuxX64Test") {
moduleDependency("jvm-on-mpp.hmpp-mod-a.commonMain", DependencyScope.TEST) moduleDependency("jvm-on-mpp.hmpp-mod-a.commonMain", DependencyScope.TEST)
@@ -324,12 +323,12 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxAndJsMain", DependencyScope.TEST) moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxAndJsMain", DependencyScope.TEST)
moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxAndJsTest", DependencyScope.TEST) moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxAndJsTest", DependencyScope.TEST)
moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxX64Main", DependencyScope.TEST) moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxX64Main", DependencyScope.TEST)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - builtin [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - builtin [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - iconv [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - iconv [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - linux [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - linux [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - posix [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - posix [linux_x64]", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - stdlib", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - stdlib", DependencyScope.PROVIDED)
libraryDependency("Kotlin/Native 1.3.50-dev-1383 - zlib [linux_x64]", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native ${kotlinVersion()} - zlib [linux_x64]", DependencyScope.PROVIDED)
} }
module("jvm-on-mpp.hmpp-mod-a.main") {} module("jvm-on-mpp.hmpp-mod-a.main") {}
module("jvm-on-mpp.hmpp-mod-a.test") {} module("jvm-on-mpp.hmpp-mod-a.test") {}
idea/testData/gradle/hierarchicalMultiplatformImport/importHMPPFlag/build.gradle.kts
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
plugins { plugins {
// TODO parametrization // TODO parametrization
kotlin("multiplatform").version("1.3.40") kotlin("multiplatform").version("1.3.50")
} }
repositories { repositories {
idea/testData/gradle/hierarchicalMultiplatformImport/importIntermediateModules/build.gradle.kts
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
plugins { plugins {
// TODO parametrization // TODO parametrization
kotlin("multiplatform").version("1.3.50-dev-1383") kotlin("multiplatform").version("1.3.50")
} }
repositories { repositories {
idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
kotlin_version = 1.3.50-dev-1383 kotlin_version = 1.3.50
coroutines_version = 1.1.1 coroutines_version = 1.1.1
moowork_node = 1.2.0 moowork_node = 1.2.0