Don't add 'kotlin' source root to build.gradle by default
#KT-14830 Fixed
This commit is contained in:
-11
@@ -58,12 +58,6 @@ public class KotlinAndroidGradleModuleConfigurator extends KotlinWithGradleConfi
|
|||||||
return APPLY_KOTLIN_ANDROID;
|
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
|
@Override
|
||||||
protected boolean addElementsToFile(@NotNull GroovyFile groovyFile, boolean isTopLevelProjectFile, @NotNull String version) {
|
protected boolean addElementsToFile(@NotNull GroovyFile groovyFile, boolean isTopLevelProjectFile, @NotNull String version) {
|
||||||
if (isTopLevelProjectFile) {
|
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() {
|
KotlinAndroidGradleModuleConfigurator() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.idea.KotlinPluginUtil;
|
|||||||
import org.jetbrains.kotlin.resolve.TargetPlatform;
|
import org.jetbrains.kotlin.resolve.TargetPlatform;
|
||||||
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
|
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
|
||||||
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
|
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 class KotlinGradleModuleConfigurator extends KotlinWithGradleConfigurator {
|
||||||
public static final String NAME = "gradle";
|
public static final String NAME = "gradle";
|
||||||
@@ -58,12 +57,6 @@ public class KotlinGradleModuleConfigurator extends KotlinWithGradleConfigurator
|
|||||||
return APPLY_KOTLIN;
|
return APPLY_KOTLIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean addSourceSetsBlock(@NotNull GroovyFile file) {
|
|
||||||
GrClosableBlock sourceSetBlock = Companion.getSourceSetsBlock(file);
|
|
||||||
return Companion.addLastExpressionInBlockIfNeeded(Companion.getSOURCE_SET(), sourceSetBlock);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean addElementsToFile(@NotNull GroovyFile groovyFile, boolean isTopLevelProjectFile, @NotNull String version) {
|
protected boolean addElementsToFile(@NotNull GroovyFile groovyFile, boolean isTopLevelProjectFile, @NotNull String version) {
|
||||||
if (!isTopLevelProjectFile) {
|
if (!isTopLevelProjectFile) {
|
||||||
|
|||||||
@@ -142,15 +142,11 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator {
|
|||||||
val dependenciesBlock = getDependenciesBlock(file)
|
val dependenciesBlock = getDependenciesBlock(file)
|
||||||
wasModified = wasModified or addExpressionInBlockIfNeeded(LIBRARY, dependenciesBlock, false)
|
wasModified = wasModified or addExpressionInBlockIfNeeded(LIBRARY, dependenciesBlock, false)
|
||||||
|
|
||||||
wasModified = wasModified or addSourceSetsBlock(file)
|
|
||||||
|
|
||||||
return wasModified
|
return wasModified
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract val applyPluginDirective: String
|
protected abstract val applyPluginDirective: String
|
||||||
|
|
||||||
protected abstract fun addSourceSetsBlock(file: GroovyFile): Boolean
|
|
||||||
|
|
||||||
protected abstract fun addElementsToFile(
|
protected abstract fun addElementsToFile(
|
||||||
groovyFile: GroovyFile,
|
groovyFile: GroovyFile,
|
||||||
isTopLevelProjectFile: Boolean,
|
isTopLevelProjectFile: Boolean,
|
||||||
|
|||||||
@@ -21,6 +21,3 @@ buildscript {
|
|||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sourceSets {
|
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
|
||||||
}
|
|
||||||
@@ -26,8 +26,5 @@ buildscript {
|
|||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sourceSets {
|
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
|
||||||
}
|
|
||||||
|
|
||||||
// VERSION: $VERSION$
|
// VERSION: $VERSION$
|
||||||
|
|||||||
@@ -26,8 +26,5 @@ buildscript {
|
|||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sourceSets {
|
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
|
||||||
}
|
|
||||||
|
|
||||||
// VERSION: $VERSION$
|
// VERSION: $VERSION$
|
||||||
@@ -26,8 +26,5 @@ buildscript {
|
|||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sourceSets {
|
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
|
||||||
}
|
|
||||||
|
|
||||||
// VERSION: $VERSION$
|
// VERSION: $VERSION$
|
||||||
|
|||||||
Reference in New Issue
Block a user