diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt index 2c8f56d4446..ab678eedc6a 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt @@ -21,7 +21,7 @@ import org.junit.Test class ImportAndCheckNavigation : MasterPluginVersionGradleImportingTestCase() { @Test - @PluginTargetVersions(gradleVersion = "5.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster) + @PluginTargetVersions(gradleVersion = "6.0+", pluginVersion = "1.4+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster) fun testNavigationToCommonizedLibrary() { val files = configureAndImportProject() diff --git a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxArm64Main/kotlin/arm64.kt b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxArm64Main/kotlin/arm64.kt index e00f840e1dc..f9b39c91039 100644 --- a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxArm64Main/kotlin/arm64.kt +++ b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxArm64Main/kotlin/arm64.kt @@ -1,13 +1,12 @@ package arm64 -import kotlinx.cinterop.CPointer -import platform.posix.FILE -import platform.posix.fopen -import platform.posix.fprintf -import platform.zlib.uInt +import kotlinx.cinterop.* +import platform.posix.* fun test() { val file: CPointer< /* NAVIGATION-TARGET:typealias FILE = */ FILE> = /* NAVIGATION-TARGET:external fun fopen */ fopen("file.txt", "r") ?: return - fun f1(): /* NAVIGATION-TARGET:typealias uInt = */ uInt = TODO() /* NAVIGATION-TARGET:external fun fprintf */ fprintf(null, "") + memScoped { + val addr: CPointerVarOf> = allocPointerTo() + } } diff --git a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxMain/kotlin/common.kt b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxMain/kotlin/common.kt index f5bd6f5ec14..02ab48da9f4 100644 --- a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxMain/kotlin/common.kt +++ b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxMain/kotlin/common.kt @@ -1,13 +1,12 @@ package common -import kotlinx.cinterop.CPointer -import platform.posix.FILE -import platform.posix.fopen -import platform.posix.fprintf -import platform.zlib.uInt +import kotlinx.cinterop.* +import platform.posix.* fun test() { - val file: CPointer< /* NAVIGATION-TARGET:expect class FILE */ FILE> = /* NAVIGATION-TARGET:external expect fun fopen */ fopen("file.txt", "r") ?: return - fun f1(): /* NAVIGATION-TARGET:expect class uInt */ uInt = TODO() + val file: CPointer< /* NAVIGATION-TARGET:typealias FILE = */ FILE> = /* NAVIGATION-TARGET:external expect fun fopen */ fopen("file.txt", "r") ?: return /* NAVIGATION-TARGET:external expect fun fprintf */ fprintf(null, "") + memScoped { + val addr: CPointerVarOf> = allocPointerTo() + } } diff --git a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxX64Main/kotlin/x64.kt b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxX64Main/kotlin/x64.kt index 0211b9ee48c..a440401dab7 100644 --- a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxX64Main/kotlin/x64.kt +++ b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/src/linuxX64Main/kotlin/x64.kt @@ -1,13 +1,12 @@ package x64 -import kotlinx.cinterop.CPointer -import platform.posix.FILE -import platform.posix.fopen -import platform.posix.fprintf -import platform.zlib.uInt +import kotlinx.cinterop.* +import platform.posix.* fun test() { val file: CPointer< /* NAVIGATION-TARGET:typealias FILE = */ FILE> = /* NAVIGATION-TARGET:external fun fopen */ fopen("file.txt", "r") ?: return - fun f1(): /* NAVIGATION-TARGET:typealias uInt = */ uInt = TODO() /* NAVIGATION-TARGET:external fun fprintf */ fprintf(null, "") + memScoped { + val addr: CPointerVarOf> = allocPointerTo() + } }