Add properties for versions, upgrade to newest

ripla · Nov 12, 2014 · 2cdb3a5 · 2cdb3a5
1 parent 9d9d56e
commit 2cdb3a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
@@ -1,6 +1,6 @@
 name := "$name$"
 
-scalaVersion := "2.10.4"
+scalaVersion := "$scalaVersion$"
 
 seq(vaadinWebSettings: _*)
 
@@ -11,7 +11,7 @@ libraryDependencies ++= Seq(
   "com.vaadin" % "vaadin-server" % "$vaadinVersion$",
   "com.vaadin" % "vaadin-client-compiled" % "$vaadinVersion$",
   "com.vaadin" % "vaadin-themes" % "$vaadinVersion$",
-  "org.vaadin.addons" % "scaladin" % "3.0.0",
+  "org.vaadin.addons" % "scaladin" % "$scaladinVersion$",
   "javax.servlet" % "javax.servlet-api" % "3.0.1" % "provided",
   "org.eclipse.jetty" % "jetty-webapp" % "9.1.3.v20140225" % "container",
   "org.eclipse.jetty" % "jetty-annotations" % "9.1.3.v20140225" % "container"

diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties
@@ -1,5 +1,7 @@
-name=Vaadin Scala project
-description=Template for Vaadin Scala projects.
-classname=VaadinScala
-package=com.example
-vaadinVersion=7.1.15
+name = Vaadin Scala project
+description = Template for Vaadin Scala projects.
+classname = VaadinScala
+package = com.example
+scalaVersion = 2.11.2
+vaadinVersion = 7.3.4
+scaladinVersion = 3.0.0