MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Gradle: rely on external Scala resolver extension declaration

Browse Source
This commit is contained in:
Pavel Fatin
2014-03-14 12:48:16 +01:00
parent 773042b0a4
commit da6d210702
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/META-INF/plugin.xml
-1
View File
@@ -62,7 +62,6 @@
<resolve.contributor implementation="org.jetbrains.plugins.gradle.service.resolve.GradleSourceSetsContributor"/>
<resolve.contributor implementation="org.jetbrains.plugins.gradle.service.resolve.GradleImplicitContributor"/>
<projectResolve implementation="org.jetbrains.plugins.gradle.service.project.BaseGradleProjectResolverExtension"/>
<projectResolve implementation="org.jetbrains.plugins.gradle.integrations.scala.ScalaGradleProjectResolverExtension"/>
</extensions>
<extensions defaultExtensionNs="com.intellij">
plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java
+1 -6
View File
@@ -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<ModuleData> 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<Class> getExtraProjectModelClasses() {
return scalaPluginPresent ? Collections.<Class>singleton(ScalaModel.class) : Collections.<Class>emptySet();
return Collections.<Class>singleton(ScalaModel.class);
}
plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
-8
View File
@@ -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);
}
}