diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java index 7e9a2f906cb..3bc7804c400 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java @@ -58,12 +58,6 @@ public class KotlinAndroidGradleModuleConfigurator extends KotlinWithGradleConfi return APPLY_KOTLIN_ANDROID; } - @Override - protected boolean addSourceSetsBlock(@NotNull GroovyFile file) { - GrClosableBlock androidBlock = getAndroidBlock(file); - return Companion.addLastExpressionInBlockIfNeeded(Companion.getSOURCE_SET(), Companion.getSourceSetsBlock(androidBlock)); - } - @Override protected boolean addElementsToFile(@NotNull GroovyFile groovyFile, boolean isTopLevelProjectFile, @NotNull String version) { if (isTopLevelProjectFile) { @@ -74,11 +68,6 @@ public class KotlinAndroidGradleModuleConfigurator extends KotlinWithGradleConfi } } - @NotNull - private static GrClosableBlock getAndroidBlock(@NotNull GroovyFile file) { - return Companion.getBlockOrCreate(file, "android"); - } - KotlinAndroidGradleModuleConfigurator() { } } diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java index 512e0a11750..49bd6a4c65d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.idea.KotlinPluginUtil; import org.jetbrains.kotlin.resolve.TargetPlatform; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; -import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock; public class KotlinGradleModuleConfigurator extends KotlinWithGradleConfigurator { public static final String NAME = "gradle"; @@ -58,12 +57,6 @@ public class KotlinGradleModuleConfigurator extends KotlinWithGradleConfigurator return APPLY_KOTLIN; } - @Override - protected boolean addSourceSetsBlock(@NotNull GroovyFile file) { - GrClosableBlock sourceSetBlock = Companion.getSourceSetsBlock(file); - return Companion.addLastExpressionInBlockIfNeeded(Companion.getSOURCE_SET(), sourceSetBlock); - } - @Override protected boolean addElementsToFile(@NotNull GroovyFile groovyFile, boolean isTopLevelProjectFile, @NotNull String version) { if (!isTopLevelProjectFile) { diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt index 356a490ff20..4b7c4a15eb1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt @@ -142,15 +142,11 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator { val dependenciesBlock = getDependenciesBlock(file) wasModified = wasModified or addExpressionInBlockIfNeeded(LIBRARY, dependenciesBlock, false) - wasModified = wasModified or addSourceSetsBlock(file) - return wasModified } protected abstract val applyPluginDirective: String - protected abstract fun addSourceSetsBlock(file: GroovyFile): Boolean - protected abstract fun addElementsToFile( groovyFile: GroovyFile, isTopLevelProjectFile: Boolean, diff --git a/idea/testData/configuration/gradle/default_after.gradle b/idea/testData/configuration/gradle/default_after.gradle index b94fa9e7414..2dfd8aa1edf 100644 --- a/idea/testData/configuration/gradle/default_after.gradle +++ b/idea/testData/configuration/gradle/default_after.gradle @@ -21,6 +21,3 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } -sourceSets { - main.java.srcDirs += 'src/main/kotlin' -} \ No newline at end of file diff --git a/idea/testData/configuration/gradle/eapVersion_after.gradle b/idea/testData/configuration/gradle/eapVersion_after.gradle index 4e0d7d7fa0d..ab5ae03cf00 100644 --- a/idea/testData/configuration/gradle/eapVersion_after.gradle +++ b/idea/testData/configuration/gradle/eapVersion_after.gradle @@ -26,8 +26,5 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } -sourceSets { - main.java.srcDirs += 'src/main/kotlin' -} // VERSION: $VERSION$ diff --git a/idea/testData/configuration/gradle/m04Version_after.gradle b/idea/testData/configuration/gradle/m04Version_after.gradle index ded3a2edf4c..91603b37ba5 100644 --- a/idea/testData/configuration/gradle/m04Version_after.gradle +++ b/idea/testData/configuration/gradle/m04Version_after.gradle @@ -26,8 +26,5 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } -sourceSets { - main.java.srcDirs += 'src/main/kotlin' -} // VERSION: $VERSION$ \ No newline at end of file diff --git a/idea/testData/configuration/gradle/rcVersion_after.gradle b/idea/testData/configuration/gradle/rcVersion_after.gradle index 4e0d7d7fa0d..ab5ae03cf00 100644 --- a/idea/testData/configuration/gradle/rcVersion_after.gradle +++ b/idea/testData/configuration/gradle/rcVersion_after.gradle @@ -26,8 +26,5 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } -sourceSets { - main.java.srcDirs += 'src/main/kotlin' -} // VERSION: $VERSION$