fix too early evaluation of ideaHome

xtext · May 7, 2015 · c800fa7 · c800fa7
1 parent 6e49e81
commit c800fa7
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/xtext-idea-gradle-plugin/src/main/java/org/xtext/gradle/idea/IdeaComponentPlugin.xtend b/xtext-idea-gradle-plugin/src/main/java/org/xtext/gradle/idea/IdeaComponentPlugin.xtend
@@ -42,6 +42,7 @@ class IdeaComponentPlugin implements Plugin<Project> {
 		val compile = project.configurations.getAt(JavaPlugin.COMPILE_CONFIGURATION_NAME)
 		compile.exclude(#{"module" -> "guava"})
 		compile.exclude(#{"module" -> "log4j"})
+		compile.exclude(#{"group" -> "org.ow2.asm"})
 
 		val ideaProvided = project.configurations.create(IDEA_PROVIDED_CONFIGURATION_NAME)
 		java.sourceSets.all [
@@ -79,27 +80,25 @@ class IdeaComponentPlugin implements Plugin<Project> {
 			runIdea.sandboxDir = idea.sandboxDir
 			runIdea.ideaHome = idea.ideaHome
 			runIdea.classpath = idea.ideaRunClasspath
+			project.tasks.withType(Test).all [
+				dependsOn(assembleSandboxTask)
+				systemProperty("idea.home.path", idea.ideaHome)
+				systemProperty("idea.plugins.path", idea.sandboxDir)
+			]
 		]
 
 		project.gradle.taskGraph.addTaskExecutionGraphListener(runIdeaValidator)
 
-		project.tasks.withType(Test).all [
-			dependsOn(assembleSandboxTask)
-			systemProperty("idea.home.path", idea.ideaHome)
-			systemProperty("idea.plugins.path", idea.sandboxDir)
-		]
-
 		project.plugins.withType(EclipsePlugin) [
 			val eclipseClasspath = project.tasks.getByName(EclipsePlugin.ECLIPSE_CP_TASK_NAME)
 			eclipseClasspath.dependsOn(idea.downloadIdea, idea.downloadPlugins)
 			project.extensions.getByType(EclipseModel).classpath => [
 				plusConfigurations.add(ideaProvided)
 
 				val fileReferenceFactory = new FileReferenceFactory
-				val sourceZip = idea.sourcesZip
 				file.whenMerged.add [ Classpath it |
 					entries.filter(Library).filter[idea.ideaCoreLibs.contains(library.file)].forEach [
-						sourcePath = fileReferenceFactory.fromFile(sourceZip)
+						sourcePath = fileReferenceFactory.fromFile(idea.sourcesZip)
 					]
 				]
 			]