From b23999539d7b1b75268aee41a1827a66403e2616 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Fri, 9 Jun 2017 11:42:17 +0200 Subject: [PATCH] made plugin compatible with gradle 3.5 #84 Signed-off-by: Christian Dietrich --- .../java/org/xtext/gradle/idea/IdeaDevelopmentPlugin.xtend | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xtext-idea-gradle-plugin/src/main/java/org/xtext/gradle/idea/IdeaDevelopmentPlugin.xtend b/xtext-idea-gradle-plugin/src/main/java/org/xtext/gradle/idea/IdeaDevelopmentPlugin.xtend index eb528d3d..38c836b7 100644 --- a/xtext-idea-gradle-plugin/src/main/java/org/xtext/gradle/idea/IdeaDevelopmentPlugin.xtend +++ b/xtext-idea-gradle-plugin/src/main/java/org/xtext/gradle/idea/IdeaDevelopmentPlugin.xtend @@ -6,6 +6,7 @@ import org.gradle.api.Project import org.gradle.api.artifacts.Configuration import org.gradle.api.execution.TaskExecutionGraphListener import org.gradle.api.plugins.BasePlugin +import org.gradle.api.plugins.JavaBasePlugin import org.gradle.api.plugins.JavaPlugin import org.gradle.api.plugins.JavaPluginConvention import org.gradle.api.tasks.testing.Test @@ -23,7 +24,6 @@ import org.xtext.gradle.idea.tasks.IdeaExtension import org.xtext.gradle.idea.tasks.RunIdea import static extension org.xtext.gradle.idea.tasks.GradleExtensions.* -import org.gradle.api.plugins.JavaBasePlugin class IdeaDevelopmentPlugin implements Plugin { public static val IDEA_DEVELOPMENT_EXTENSION_NAME = "ideaDevelopment" @@ -170,7 +170,8 @@ class IdeaDevelopmentPlugin implements Plugin { plusConfigurations.add(ideaProvided) val fileReferenceFactory = new FileReferenceFactory - file.whenMerged.add [ Classpath it | + + file.whenMerged [ Classpath it | entries.filter(Library).filter[idea.ideaCoreLibs.contains(library.file)].forEach [ sourcePath = fileReferenceFactory.fromFile(idea.sourcesZip) ]