diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index 72fa9e765c7d..ef28a82b7071 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -62,7 +62,6 @@
-
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java
index 1b5df1420a2d..657d064e2886 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java
@@ -31,7 +31,6 @@ import org.jetbrains.plugins.gradle.model.data.ScalaCompileOptionsData;
import org.jetbrains.plugins.gradle.model.data.ScalaModelData;
import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension;
import org.jetbrains.plugins.gradle.util.GradleConstants;
-import org.jetbrains.plugins.gradle.util.GradleUtil;
import java.util.Collections;
import java.util.Set;
@@ -44,12 +43,8 @@ import java.util.Set;
public class ScalaGradleProjectResolverExtension extends AbstractProjectResolverExtension {
private static final Logger LOG = Logger.getInstance(ScalaGradleProjectResolverExtension.class);
- private static final boolean scalaPluginPresent = GradleUtil.isPluginPresent("org.intellij.scala");
-
@Override
public void populateModuleExtraModels(@NotNull IdeaModule gradleModule, @NotNull DataNode ideModule) {
- if (!scalaPluginPresent) return;
-
ScalaModel scalaModel = resolverCtx.getExtraProject(gradleModule, ScalaModel.class);
if (scalaModel != null) {
ScalaModelData scalaModelData = create(scalaModel);
@@ -62,7 +57,7 @@ public class ScalaGradleProjectResolverExtension extends AbstractProjectResolver
@NotNull
@Override
public Set getExtraProjectModelClasses() {
- return scalaPluginPresent ? Collections.singleton(ScalaModel.class) : Collections.emptySet();
+ return Collections.singleton(ScalaModel.class);
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
index d5750d5987c8..7e182a6eda66 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
@@ -247,12 +247,4 @@ public class GradleUtil {
public static String createJvmArg(@NotNull String name, @NotNull String value) {
return String.format(JVM_ARG_FORMAT, name, value);
}
-
- public static boolean isPluginPresent(@NotNull String id) {
- PluginId pluginId = PluginId.getRegisteredIds().get(id);
- if (pluginId == null) return false;
- IdeaPluginDescriptor pluginDescriptor = PluginManager.getPlugin(pluginId);
- if (pluginDescriptor == null) return false;
- return !PluginManagerCore.shouldSkipPlugin(pluginDescriptor);
- }
}