From 262b3fde3de9da4e3347fe4323c04e636bd2d0a9 Mon Sep 17 00:00:00 2001 From: Kirill Shmakov Date: Wed, 27 Feb 2019 20:51:04 +0300 Subject: [PATCH] Fix Gradle MPP integration tests #KT-30056 Fixed --- .../kotlin/gradle/NewMultiplatformIT.kt | 16 ++-- .../sample-external-lib/build.gradle | 90 +++++++++++++++++++ .../sample-external-lib/settings.gradle | 2 + .../src/commonMain/kotlin/Common.kt | 5 ++ .../resources/commonMainResource.txt | 1 + .../src/jvm6Main/kotlin/Main.kt | 7 ++ .../jvm6Main/resources/jvm6MainResource.txt | 1 + .../src/linux64Main/kotlin/Main.kt | 5 ++ .../resources/linux64MainResource.txt | 1 + .../src/macos64Main/kotlin/Main.kt | 5 ++ .../resources/macos64MainResource.txt | 1 + .../src/mingw64Main/kotlin/Main.kt | 5 ++ .../resources/mingw64MainResource.txt | 1 + .../src/nodeJsMain/kotlin/Main.kt | 12 +++ .../resources/nodeJsMainResource.txt | 1 + .../src/wasm32Main/kotlin/Main.kt | 5 ++ .../resources/wasm32MainResource.txt | 1 + .../groovy-dsl/build.gradle | 7 +- .../groovy-dsl/exported/build.gradle | 4 + .../src/commonMain/kotlin/exported.kt | 2 + .../src/commonMain/kotlin/PackageMain.kt | 7 +- .../groovy-dsl/src/commonTest/kotlin/test.kt | 10 +-- .../kotlin-dsl/build.gradle.kts | 5 -- .../kotlin-dsl/exported/build.gradle.kts | 6 +- .../src/commonMain/kotlin/exported.kt | 2 + .../src/commonMain/kotlin/PackageMain.kt | 5 +- .../kotlin-dsl/src/commonTest/kotlin/test.kt | 6 +- 27 files changed, 183 insertions(+), 30 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/build.gradle create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/settings.gradle create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/commonMain/kotlin/Common.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/commonMain/resources/commonMainResource.txt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/jvm6Main/kotlin/Main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/jvm6Main/resources/jvm6MainResource.txt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/linux64Main/kotlin/Main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/linux64Main/resources/linux64MainResource.txt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/macos64Main/kotlin/Main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/macos64Main/resources/macos64MainResource.txt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/mingw64Main/kotlin/Main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/mingw64Main/resources/mingw64MainResource.txt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/nodeJsMain/kotlin/Main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/nodeJsMain/resources/nodeJsMainResource.txt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/wasm32Main/kotlin/Main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/wasm32Main/resources/wasm32MainResource.txt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 218a612b989..d96b8eaf446 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.gradle @@ -1171,28 +1171,28 @@ class NewMultiplatformIT : BaseGradleIT() { fun testPublishMultimoduleProjectWithMetadata() = doTestPublishMultimoduleProject(withMetadata = true) private fun doTestPublishMultimoduleProject(withMetadata: Boolean) { - val libProject = Project("sample-lib", gradleVersion, "new-mpp-lib-and-app").apply { + val libProject = Project("sample-lib", gradleVersion, "new-mpp-lib-and-app") + libProject.setupWorkingDir() + + val externalLibProject = Project("sample-external-lib", gradleVersion, "new-mpp-lib-and-app").apply { if (withMetadata) { setupWorkingDir() - // Make another publication that will be consumed as a module with metadata, see a similar conditional block below: - projectDir.resolve("settings.gradle").writeText("rootProject.name = 'external'; enableFeaturePreview 'GRADLE_METADATA'") + // Publish it into local repository of adjacent lib: gradleBuildScript().appendText( "\n" + """ - group = "com.external.dependency" - version = "1.2.3" publishing { repositories { - maven { url "file://${'$'}{rootProject.projectDir.absolutePath.replace('\\', '/')}/repo" } + maven { url "file://${'$'}{rootProject.projectDir.absolutePath.replace('\\', '/')}/../sample-lib/repo" } } } """.trimIndent() ) build("publish") { assertSuccessful() - gradleBuildScript().appendText("\ngroup = 'com.example'; version = '1.0'") } } } + val appProject = Project("sample-app", gradleVersion, "new-mpp-lib-and-app") with(libProject) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/build.gradle new file mode 100644 index 00000000000..108aefb104b --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/build.gradle @@ -0,0 +1,90 @@ +group = "com.external.dependency" +version = "1.2.3" + +buildscript { + repositories { + mavenLocal() + jcenter() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +apply plugin: 'kotlin-multiplatform' + +repositories { + mavenLocal() + jcenter() + maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" } +} + +kotlin { + // Check the new preset functions: + jvm('jvm6') { } + js('nodeJs') + targetFromPreset(presets.wasm32) { println targetName } + targetFromPreset(presets.jvm, 'jvm6') { println targetName } // access existing target + + targets { + // Also check that the old DSL (fromPreset) works: + fromPreset(presets.linuxX64, 'linux64') + fromPreset(presets.mingwX64, 'mingw64') + fromPreset(presets.macosX64, 'macos64') + + // Check the DSL constructs in the Groovy DSL: + fromPreset(presets.jvm, 'jvm6') { + println "Configuring $targetName" + compilations.main { + kotlinOptions { + println "jvmTarget = " + jvmTarget + } + defaultSourceSet { + println "Kotlin srcDirs: " + kotlin.srcDirs + } + } + } + + all { + mavenPublication { + pom.withXml { + asNode().appendNode('name', 'Sample MPP library') + } + } + } + } + + sourceSets { + commonMain { + dependencies { + api 'org.jetbrains.kotlin:kotlin-stdlib-common' + } + } + jvm6Main { + dependencies { + api 'org.jetbrains.kotlin:kotlin-stdlib' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.23.4' + } + } + nodeJsMain { + dependencies { + api 'org.jetbrains.kotlin:kotlin-stdlib-js' + implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.6.11' + } + } + } +} + +kotlin.sourceSets.each { println it.kotlin.srcDirs } + +apply plugin: 'maven-publish' + +// Check that a compilation may be created after project evaluation, KT-28896: +afterEvaluate { + kotlin { + jvm('jvm6').compilations.create('benchmark') { + defaultSourceSet.dependsOn(sourceSets.jvm6Main) + assemble.dependsOn compileKotlinTask + } + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/settings.gradle new file mode 100644 index 00000000000..401f1df0993 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/settings.gradle @@ -0,0 +1,2 @@ +enableFeaturePreview('GRADLE_METADATA') +rootProject.name = 'external' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/commonMain/kotlin/Common.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/commonMain/kotlin/Common.kt new file mode 100644 index 00000000000..b32a661e2c9 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/commonMain/kotlin/Common.kt @@ -0,0 +1,5 @@ +package com.example.externalLib + +fun id(t: T): T = t + +expect fun expectedFun(): Unit diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/commonMain/resources/commonMainResource.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/commonMain/resources/commonMainResource.txt new file mode 100644 index 00000000000..d2c4f080510 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/commonMain/resources/commonMainResource.txt @@ -0,0 +1 @@ +resource \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/jvm6Main/kotlin/Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/jvm6Main/kotlin/Main.kt new file mode 100644 index 00000000000..8af51804591 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/jvm6Main/kotlin/Main.kt @@ -0,0 +1,7 @@ +package com.example.externalLib + +fun x(): String = "x" + +actual fun expectedFun() { + println(id(x())) +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/jvm6Main/resources/jvm6MainResource.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/jvm6Main/resources/jvm6MainResource.txt new file mode 100644 index 00000000000..d2c4f080510 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/jvm6Main/resources/jvm6MainResource.txt @@ -0,0 +1 @@ +resource \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/linux64Main/kotlin/Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/linux64Main/kotlin/Main.kt new file mode 100644 index 00000000000..c455f84df23 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/linux64Main/kotlin/Main.kt @@ -0,0 +1,5 @@ +package com.example.externalLib + +actual fun expectedFun(): Unit { + id(123) +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/linux64Main/resources/linux64MainResource.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/linux64Main/resources/linux64MainResource.txt new file mode 100644 index 00000000000..d2c4f080510 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/linux64Main/resources/linux64MainResource.txt @@ -0,0 +1 @@ +resource \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/macos64Main/kotlin/Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/macos64Main/kotlin/Main.kt new file mode 100644 index 00000000000..c455f84df23 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/macos64Main/kotlin/Main.kt @@ -0,0 +1,5 @@ +package com.example.externalLib + +actual fun expectedFun(): Unit { + id(123) +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/macos64Main/resources/macos64MainResource.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/macos64Main/resources/macos64MainResource.txt new file mode 100644 index 00000000000..d2c4f080510 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/macos64Main/resources/macos64MainResource.txt @@ -0,0 +1 @@ +resource \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/mingw64Main/kotlin/Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/mingw64Main/kotlin/Main.kt new file mode 100644 index 00000000000..c455f84df23 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/mingw64Main/kotlin/Main.kt @@ -0,0 +1,5 @@ +package com.example.externalLib + +actual fun expectedFun(): Unit { + id(123) +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/mingw64Main/resources/mingw64MainResource.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/mingw64Main/resources/mingw64MainResource.txt new file mode 100644 index 00000000000..d2c4f080510 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/mingw64Main/resources/mingw64MainResource.txt @@ -0,0 +1 @@ +resource \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/nodeJsMain/kotlin/Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/nodeJsMain/kotlin/Main.kt new file mode 100644 index 00000000000..8098a2fdc62 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/nodeJsMain/kotlin/Main.kt @@ -0,0 +1,12 @@ +package com.example.externalLib + +import com.example.externalLib.id +import com.example.externalLib.expectedFun + +fun idUsage() = id("123") + +actual fun expectedFun() = Unit + +fun main(args: Array) { + expectedFun() +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/nodeJsMain/resources/nodeJsMainResource.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/nodeJsMain/resources/nodeJsMainResource.txt new file mode 100644 index 00000000000..d2c4f080510 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/nodeJsMain/resources/nodeJsMainResource.txt @@ -0,0 +1 @@ +resource \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/wasm32Main/kotlin/Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/wasm32Main/kotlin/Main.kt new file mode 100644 index 00000000000..c455f84df23 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/wasm32Main/kotlin/Main.kt @@ -0,0 +1,5 @@ +package com.example.externalLib + +actual fun expectedFun(): Unit { + id(123) +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/wasm32Main/resources/wasm32MainResource.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/wasm32Main/resources/wasm32MainResource.txt new file mode 100644 index 00000000000..d2c4f080510 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/src/wasm32Main/resources/wasm32MainResource.txt @@ -0,0 +1 @@ +resource \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/build.gradle index 69f1cb737b1..0d4924b97d1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/build.gradle @@ -20,15 +20,10 @@ kotlin { commonMain { dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-common" - } - } - - iosMain { - dependencies { api(project(":exported")) } } - + commonTest { dependencies { api "org.jetbrains.kotlin:kotlin-test-annotations-common" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/build.gradle index d6adaf19e14..7c2344677f4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/build.gradle @@ -16,4 +16,8 @@ kotlin { } iosArm64("ios") + macosX64("macos64") + linuxX64("linux64") + mingwX64("mingw64") + iosX64("iosSim") } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/src/commonMain/kotlin/exported.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/src/commonMain/kotlin/exported.kt index 6905fb96702..749193b800f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/src/commonMain/kotlin/exported.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/src/commonMain/kotlin/exported.kt @@ -1 +1,3 @@ +package com.example + fun exported() = 42 \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonMain/kotlin/PackageMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonMain/kotlin/PackageMain.kt index 0077bb41f7b..ec62e37c2d0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonMain/kotlin/PackageMain.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonMain/kotlin/PackageMain.kt @@ -1,5 +1,8 @@ package foo +import com.example.exported + fun main() { - println("foo.main") -} + val exp = exported() + println("foo.main: exp = $exp") +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonTest/kotlin/test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonTest/kotlin/test.kt index 749c82e2487..d6c2b76f9b2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonTest/kotlin/test.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonTest/kotlin/test.kt @@ -1,11 +1,9 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - +import com.example.exported import kotlin.test.* @Test fun foo() { - println("tests.foo") + val exp = exported() + assertTrue(exp % 7 == 0, "Not divisible by 7") + println("tests.foo: exp = $exp") } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/build.gradle.kts index 6b864bbc730..ad4e925b7f8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/build.gradle.kts @@ -12,11 +12,6 @@ kotlin { sourceSets["commonMain"].apply { dependencies { api("org.jetbrains.kotlin:kotlin-stdlib-common") - } - } - - sourceSets.create("iosMain").apply { - dependencies { api(project(":exported")) } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/build.gradle.kts index a4027a9c3a4..bebfb1a22c5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/build.gradle.kts @@ -15,5 +15,9 @@ kotlin { } } - iosArm64("ios") + iosArm64("ios") + macosX64("macos64") + linuxX64("linux64") + mingwX64("mingw64") + iosX64("iosSim") } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/src/commonMain/kotlin/exported.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/src/commonMain/kotlin/exported.kt index 6905fb96702..749193b800f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/src/commonMain/kotlin/exported.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/src/commonMain/kotlin/exported.kt @@ -1 +1,3 @@ +package com.example + fun exported() = 42 \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonMain/kotlin/PackageMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonMain/kotlin/PackageMain.kt index 0077bb41f7b..24634772e19 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonMain/kotlin/PackageMain.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonMain/kotlin/PackageMain.kt @@ -1,5 +1,8 @@ package foo +import com.example.exported + fun main() { - println("foo.main") + val exp = exported() + println("foo.main: exp = $exp") } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonTest/kotlin/test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonTest/kotlin/test.kt index 50a6ea99ab2..dc46dc203e3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonTest/kotlin/test.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonTest/kotlin/test.kt @@ -1,6 +1,10 @@ import kotlin.test.* +import com.example.exported + @Test fun foo() { - println("tests.foo") + val exp = exported() + assertTrue(exp % 7 == 0, "Not divisible by 7") + println("tests.foo: exp = $exp") } \ No newline at end of file