Merge pull request #2 from lampepfl/nicolasstucki-patch-1

Upgrade to 0.10-RC1

Author: allanrenucci

README.md

@@ -6,7 +6,7 @@ A [Giter8][g8] template for a minimal [Dotty] staging project.
 
 Template usage
 --------------
-Using `sbt` version `1.1.4+`, do:
+Using `sbt` version `1.1.5+`, do:
 ```
 sbt new lampepfl/dotty-quoted.g8
 ```

src/main/g8/build.sbt

@@ -1,4 +1,4 @@
-val dottyVersion = "0.9.0-RC1"
+val dottyVersion = "0.10.0-RC1"
 
 lazy val root = project
   .in(file("."))
@@ -9,8 +9,8 @@ lazy val root = project
     scalaVersion := dottyVersion,
 
     libraryDependencies ++= Seq(
-      "ch.epfl.lamp" % "dotty_0.9" % dottyVersion,
-      "ch.epfl.lamp" % "dotty_0.9" % dottyVersion % "test->runtime",
+      "ch.epfl.lamp" % "dotty_0.10" % dottyVersion,
+      "ch.epfl.lamp" % "dotty_0.10" % dottyVersion % "test->runtime",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )
   )

src/main/g8/project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.4
+sbt.version=1.2.3

src/main/g8/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.2.2")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.2.4")

src/main/g8/src/main/scala/Main.scala

@@ -1,12 +1,12 @@
 
-// Needed to run or show quotes
-import dotty.tools.dotc.quoted.Toolbox._
-
 // Import Expr and some extension methods
 import scala.quoted._
 
 object Main {
 
+  // Needed to run or show quotes
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
+
   def main(args: Array[String]): Unit = {
     val square = stagedPower(2)
     println("3^2 = " + square(3))

src/main/g8/src/test/scala/Test1.scala

@@ -1,11 +1,12 @@
 
-// Needed to run or show quotes
-import dotty.tools.dotc.quoted.Toolbox._
-
 import org.junit.Test
 import org.junit.Assert._
 
 class Test1 {
+
+  // Needed to run or show quotes
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
+
   @Test def t1(): Unit = {
     val code = '(println("foo"))
     assertEquals("scala.Predef.println(\"foo\")", code.show)