diff --git a/.travis.yml b/.travis.yml index c635c90..06337e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: ## This runs the template with the default parameters, and runs test within the templated app. - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test - - pushd target/sbt-test/dotty-tasty-inspector-template/scripted + - pushd target/sbt-test/scala3-tasty-inspector-template/scripted - sbt inspector/run test - popd diff --git a/build.sbt b/build.sbt index 31bfe37..97e2bc4 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ lazy val root = project .in(file(".")) .settings( - name := "dotty-tasty-inspector-template", + name := "scala3-tasty-inspector-template", test in Test := { val _ = (g8Test in Test).toTask("").value }, diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 45574a9..d48f6c3 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,4 +1,4 @@ -val dottyVersion = "3.0.0-M2" +val scala3Version = "3.0.0-M3" lazy val lib = project .in(file("lib")) @@ -6,7 +6,7 @@ lazy val lib = project name := "lib", version := "0.1.0", - scalaVersion := dottyVersion, + scalaVersion := scala3Version, libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" ) @@ -17,10 +17,10 @@ lazy val inspector = project name := "inspector", version := "0.1.0", - scalaVersion := dottyVersion, + scalaVersion := scala3Version, libraryDependencies ++= Seq( - "org.scala-lang" %% "scala3-tasty-inspector" % dottyVersion, + "org.scala-lang" %% "scala3-tasty-inspector" % scala3Version, "com.novocode" % "junit-interface" % "0.11" % "test" ) ) diff --git a/src/main/g8/inspector/src/main/scala/inspector/Main.scala b/src/main/g8/inspector/src/main/scala/inspector/Main.scala index 8a76311..b48b3b8 100644 --- a/src/main/g8/inspector/src/main/scala/inspector/Main.scala +++ b/src/main/g8/inspector/src/main/scala/inspector/Main.scala @@ -3,7 +3,6 @@ package inspector import scala.quoted._ @main def run = - val tastyFile = "lib/target/scala-3.0.0-M2/classes/lib/Greetings.tasty" + val tastyFile = "lib/target/scala-3.0.0-M3/classes/lib/Greetings.tasty" val tastyContents = Inspector.showCodeOf(tastyFile) println(tastyContents) - diff --git a/src/main/g8/inspector/src/test/scala/inspector/Test.scala b/src/main/g8/inspector/src/test/scala/inspector/Test.scala index fc8bd8a..95e668a 100644 --- a/src/main/g8/inspector/src/test/scala/inspector/Test.scala +++ b/src/main/g8/inspector/src/test/scala/inspector/Test.scala @@ -14,7 +14,7 @@ class InspectorTest { | def hello(name: scala.Predef.String): scala.Predef.String = "Hello ".+(name) | } |}""".stripMargin, - Inspector.showCodeOf("lib/target/scala-3.0.0-M2/classes/lib/Greetings.tasty") + Inspector.showCodeOf("lib/target/scala-3.0.0-M3/classes/lib/Greetings.tasty") ) } diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt index 83a3da1..b12914f 100644 --- a/src/main/g8/project/plugins.sbt +++ b/src/main/g8/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6") +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.0")