upgrade to Xtext 2.5.4+

xtext · May 20, 2014 · 94f446c · 94f446c
1 parent 2edcec7
commit 94f446c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/xtext-gradle-lib/build.gradle b/xtext-gradle-lib/build.gradle
@@ -1,6 +1,8 @@
 dependencies {
   compile localGroovy()
-  compile "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:2.5.3"
+  compile ("org.eclipse.xtext:org.eclipse.xtext.builder.standalone:[2.5.4,)") {
+    exclude group:'asm', module:'asm'
+  }
 }
 
 uploadArchives.repositories.mavenDeployer.pom.project {

diff --git a/xtext-gradle-plugin/build.gradle b/xtext-gradle-plugin/build.gradle
@@ -3,6 +3,12 @@ dependencies {
   compile gradleApi()
 }
 
+jar {
+  manifest {
+    attributes("Implementation-Version": version)
+  }
+}
+
 uploadArchives.repositories.mavenDeployer.pom.project {
   name 'Xtext Gradle Plugin'
   description 'A plugin for invoking Xtext base Code generators'

diff --git a/xtext-gradle-plugin/src/main/groovy/org/xtext/gradle/XtextPlugin.groovy b/xtext-gradle-plugin/src/main/groovy/org/xtext/gradle/XtextPlugin.groovy
@@ -26,6 +26,10 @@ class XtextPlugin implements Plugin<Project> {
 	XtextPlugin(FileResolver fileResolver) {
 		this.fileResolver = fileResolver
 	}
+
+  private String getPluginVersion() {
+    this.class.package.implementationVersion
+  }
 
 	def void apply(Project project) {
 		project.plugins.apply(BasePlugin)
@@ -45,8 +49,11 @@ class XtextPlugin implements Plugin<Project> {
 		eclipse.getProject().natures("org.eclipse.xtext.ui.shared.xtextNature")
 
 		project.afterEvaluate{
-			project.dependencies.add("xtextTooling", "org.eclipse.xtext:org.eclipse.xtext:${xtext.version}")
-			project.dependencies.add("xtextTooling", "org.xtext:xtext-gradle-lib:0.0.3")
+			project.dependencies.add("xtextTooling", "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:${xtext.version}") {
+      	force = true
+        exclude group:'asm'
+      }
+			project.dependencies.add("xtextTooling", "org.xtext:xtext-gradle-lib:${pluginVersion}")
 
 			def XtextGenerate generatorTask = project.tasks.create("xtextGenerate", XtextGenerate)
 			def JavaPluginConvention java = project.convention.findPlugin(JavaPluginConvention)