Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
8 changes: 4 additions & 4 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
val dottyVersion = "3.0.0-M2"
val scala3Version = "3.0.0-M3"

lazy val lib = project
.in(file("lib"))
.settings(
name := "lib",
version := "0.1.0",

scalaVersion := dottyVersion,
scalaVersion := scala3Version,

libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
)
Expand All @@ -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"
)
)
Expand Down
3 changes: 1 addition & 2 deletions src/main/g8/inspector/src/main/scala/inspector/Main.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)

2 changes: 1 addition & 1 deletion src/main/g8/inspector/src/test/scala/inspector/Test.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)

}
Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.0")