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 76e8f5fec1d..cfe0e26d208 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 @@ -160,11 +160,8 @@ class NewMultiplatformIT : BaseGradleIT() { assertFileExists("build/bin/wasm32/mainDebugExecutable/main.wasm.js") assertFileExists("build/bin/wasm32/mainDebugExecutable/main.wasm") - assertFileExists("build/bin/wasm32/mainReleaseExecutable/main.wasm.js") - assertFileExists("build/bin/wasm32/mainReleaseExecutable/main.wasm") val nativeExeName = if (isWindows) "main.exe" else "main.kexe" - assertFileExists("build/bin/$nativeHostTargetName/mainReleaseExecutable/$nativeExeName") assertFileExists("build/bin/$nativeHostTargetName/mainDebugExecutable/$nativeExeName") // Check that linker options were correctly passed to the K/N compiler. diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt index be4594253f6..d23c6ad20d0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt @@ -102,6 +102,7 @@ class GeneralNativeIT : BaseGradleIT() { with( transformProjectWithPluginsDsl("native-endorsed") ) { + configureSingleNativeTarget() setupWorkingDir() build("build") { @@ -126,21 +127,21 @@ class GeneralNativeIT : BaseGradleIT() { val sharedSuffix = CompilerOutputKind.DYNAMIC.suffix(HostManager.host) val sharedPaths = listOf( "build/bin/host/debugShared/$sharedPrefix$baseName$sharedSuffix", - "build/bin/host/releaseShared/$sharedPrefix$baseName$sharedSuffix" +// "build/bin/host/releaseShared/$sharedPrefix$baseName$sharedSuffix" ) val staticPrefix = CompilerOutputKind.STATIC.prefix(HostManager.host) val staticSuffix = CompilerOutputKind.STATIC.suffix(HostManager.host) val staticPaths = listOf( "build/bin/host/debugStatic/$staticPrefix$baseName$staticSuffix", - "build/bin/host/releaseStatic/$staticPrefix$baseName$staticSuffix" +// "build/bin/host/releaseStatic/$staticPrefix$baseName$staticSuffix" ) val headerPaths = listOf( "build/bin/host/debugShared/$sharedPrefix${baseName}_api.h", - "build/bin/host/releaseShared/$sharedPrefix${baseName}_api.h", +// "build/bin/host/releaseShared/$sharedPrefix${baseName}_api.h", "build/bin/host/debugStatic/$staticPrefix${baseName}_api.h", - "build/bin/host/releaseStatic/$staticPrefix${baseName}_api.h" +// "build/bin/host/releaseStatic/$staticPrefix${baseName}_api.h" ) val klibPrefix = CompilerOutputKind.LIBRARY.prefix(HostManager.host) @@ -149,9 +150,9 @@ class GeneralNativeIT : BaseGradleIT() { val linkTasks = listOf( ":linkDebugSharedHost", - ":linkReleaseSharedHost", +// ":linkReleaseSharedHost", ":linkDebugStaticHost", - ":linkReleaseStaticHost" +// ":linkReleaseStaticHost" ) val klibTask = ":compileKotlinHost" @@ -198,15 +199,15 @@ class GeneralNativeIT : BaseGradleIT() { val frameworkPaths = listOf( "build/bin/host/mainDebugFramework/$frameworkPrefix$baseName$frameworkSuffix.dSYM", "build/bin/host/mainDebugFramework/$frameworkPrefix$baseName$frameworkSuffix", - "build/bin/host/mainReleaseFramework/$frameworkPrefix$baseName$frameworkSuffix" ) val headerPaths = listOf( "build/bin/host/mainDebugFramework/$frameworkPrefix$baseName$frameworkSuffix/headers/$baseName.h", - "build/bin/host/mainReleaseFramework/$frameworkPrefix$baseName$frameworkSuffix/headers/$baseName.h", ) - val frameworkTasks = listOf(":linkMainDebugFrameworkHost", ":linkMainReleaseFrameworkHost") + val frameworkTasks = listOf( + ":linkMainDebugFrameworkHost", + ) // Building build("assemble") { @@ -295,9 +296,8 @@ class GeneralNativeIT : BaseGradleIT() { */ @Test - @Ignore fun testNativeBinaryKotlinDSL() = with( - transformProjectWithPluginsDsl("kotlin-dsl", directoryPrefix = "native-binaries") + transformProjectWithPluginsDsl("kotlin-dsl", directoryPrefix = "native-binaries-old") ) { val hostSuffix = nativeHostTargetName.capitalize() @@ -319,7 +319,7 @@ class GeneralNativeIT : BaseGradleIT() { val prefix = outputKind.prefix(HostManager.host) val suffix = outputKind.suffix(HostManager.host) val fileName = "$prefix$fileBaseName$suffix" - name to "build/bin/host/$name/$fileName" + name to "build/bin/${nativeHostTargetName}/$name/$fileName" }.toMap() val runTasks = listOf( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/frameworks/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/frameworks/build.gradle.kts index 17418f22dcc..4d941dacc50 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/frameworks/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/frameworks/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { ("host") { binaries { - framework("main") { + framework("main", listOf(DEBUG)) { export(project(":exported")) } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/libraries/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/libraries/build.gradle.kts index f99b1fd5043..0a666c85a26 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/libraries/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/libraries/build.gradle.kts @@ -17,13 +17,11 @@ kotlin { ("host") { binaries { - binaries { - sharedLib { - export(project(":exported")) - } - staticLib { - export(project(":exported")) - } + sharedLib(listOf(DEBUG)) { + export(project(":exported")) + } + staticLib(listOf(DEBUG)) { + export(project(":exported")) } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/build.gradle.kts index 94c2035ca13..f8ca427daa0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/build.gradle.kts @@ -5,37 +5,21 @@ plugins { repositories { mavenLocal() jcenter() - maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } } kotlin { + val commonNative by sourceSets.creating {} - val macos = macosX64("macos64") - val linux = linuxX64("linux64") - val windows = mingwX64("mingw64") - - sourceSets { - val commonNative by creating {} - - windows.compilations["main"].defaultSourceSet { + ("host") { + compilations["main"].defaultSourceSet { dependsOn(commonNative) } - linux.compilations["main"].defaultSourceSet { - dependsOn(commonNative) - } - macos.compilations["main"].defaultSourceSet { - dependsOn(commonNative) - } - } - - - configure(listOf(macos, linux, windows)) { compilations.all { kotlinOptions.verbose = true enableEndorsedLibs = true } binaries { - executable() + executable(listOf(DEBUG)) } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-libraries/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-libraries/build.gradle index 4699ab0110d..8cda3ae3a95 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-libraries/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-libraries/build.gradle @@ -22,7 +22,7 @@ repositories { kotlin { targets { fromPreset(presets.macosX64, 'macos64') { - binaries.framework("main") + binaries.framework("main", [DEBUG]) } fromPreset(presets.linuxX64, 'linux64') @@ -30,8 +30,8 @@ kotlin { configure([linux64, mingw64, macos64]) { binaries { - sharedLib("main") - staticLib("main") + sharedLib("main", [DEBUG]) + staticLib("main", [DEBUG]) } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-associate-compilations/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-associate-compilations/build.gradle index 1d4a3874749..bac55e85e18 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-associate-compilations/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-associate-compilations/build.gradle @@ -96,7 +96,7 @@ kotlin { getByName("integration") { binaries { - test("integration") { + test("integration", [DEBUG]) { compilation = compilations["integrationTest"] } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts index 77773164a15..bb36654a357 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts @@ -27,7 +27,7 @@ kotlin { val macos64 = macosX64("macos64") configure(listOf(wasm32, linux64, mingw64, macos64)) { - binaries.executable("main") { + binaries.executable("main", listOf(DEBUG)) { entryPoint = "com.example.app.native.main" } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle index 108c1739542..14857faad31 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle @@ -68,7 +68,7 @@ kotlin { fromPreset(presets.macosX64, 'macos64') configure([wasm32, linux64, mingw64, macos64]) { - binaries.executable("main") { + binaries.executable("main", [DEBUG]) { entryPoint = "com.example.app.native.main" }