diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt index a0c316bea1c..7895a1d89c0 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt @@ -643,6 +643,22 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } } + @Test + @PluginTargetVersions(gradleVersion = "6.0+", pluginVersion = "1.5.20+") + fun testDetectAndroidNonEmptyResources() { + configureByFiles() + createProjectSubFile( + "local.properties", + "sdk.dir=/${KtTestUtil.getAndroidSdkSystemIndependentPath()}" + ) + importProject(true) + checkProjectStructure(exhaustiveModuleList = false, exhaustiveDependencyList = false, exhaustiveSourceSourceRootList = false) { + module("project.multiplatformb") { + sourceFolder("multiplatformb/src/androidTest/resources", JavaResourceRootType.TEST_RESOURCE) + } + } + } + /** * This test is inherited form testPlatformToCommonExpectedByInComposite and actually tests * dependencies in multiplatform project included in composite build diff --git a/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/build.gradle b/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/build.gradle new file mode 100644 index 00000000000..dd881917214 --- /dev/null +++ b/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/build.gradle @@ -0,0 +1,24 @@ +buildscript { + def kotlinVersion = "{{kotlin_plugin_version}}" + + + ext.kotlin_version = "$kotlinVersion" + repositories { + {{kotlin_plugin_repositories}} + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.5.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + {{kotlin_plugin_repositories}} + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/multiplatformb/build.gradle b/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/multiplatformb/build.gradle new file mode 100644 index 00000000000..5ffa45bf10b --- /dev/null +++ b/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/multiplatformb/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'kotlin-multiplatform' +} + +apply plugin: 'com.android.library' + +android { + compileSdkVersion 28 + buildToolsVersion '28.0.3' + defaultConfig { + minSdkVersion 15 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + + } +} + +kotlin { + android("android") +} diff --git a/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/multiplatformb/src/androidTest/resources/configs/file.json b/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/multiplatformb/src/androidTest/resources/configs/file.json new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/multiplatformb/src/androidTest/resources/schema.json b/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/multiplatformb/src/androidTest/resources/schema.json new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/settings.gradle b/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/settings.gradle new file mode 100644 index 00000000000..48f9c3103c7 --- /dev/null +++ b/idea/testData/gradle/newMultiplatformImport/detectAndroidNonEmptyResources/settings.gradle @@ -0,0 +1 @@ +include(":multiplatformb")