Allow configuring what GWT version is used with Vaadin 6 #11

johndevs · Feb 3, 2013 · e4540f4 · e4540f4
1 parent 57745ce
commit e4540f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/groovy/fi/jasoft/plugin/DependencyListener.groovy b/src/main/groovy/fi/jasoft/plugin/DependencyListener.groovy
@@ -68,12 +68,13 @@ class DependencyListener implements ProjectEvaluationListener{
 		def jettyVersion = "8.1.5.v20120716"	
 		project.dependencies.add('jetty8', "org.mortbay.jetty:jetty-runner:$jettyVersion")
 
-		def version = project.vaadin.version;
+		def version = project.vaadin.version
+		def gwtVersion = project.vaadin.gwt.version
 		if(version.startsWith("6")){
 			project.dependencies.add("vaadin", "com.vaadin:vaadin:"+version)
 			if(project.vaadin.widgetset != null){
-				project.dependencies.add("gwt", "com.google.gwt:gwt-user:2.3.0")
-				project.dependencies.add("gwt", "com.google.gwt:gwt-dev:2.3.0")
+				project.dependencies.add("gwt", "com.google.gwt:gwt-user:"+gwtVersion)
+				project.dependencies.add("gwt", "com.google.gwt:gwt-dev:"+gwtVersion)
 				project.dependencies.add("gwt",	"javax.validation:validation-api:1.0.0.GA")
 				project.dependencies.add("gwt",	"javax.validation:validation-api:1.0.0.GA:sources")
 			}

diff --git a/src/main/groovy/fi/jasoft/plugin/VaadinPluginExtension.groovy b/src/main/groovy/fi/jasoft/plugin/VaadinPluginExtension.groovy
@@ -36,6 +36,7 @@ class VaadinPluginExtension{
 		boolean strict = false
 		String userAgent = "ie8,ie9,gecko1_8,safari,opera"
 		String[] jvmArgs = null
+		String version = "2.3"
 	}
 
 	// DevMode