Skip to content

Commit ec7ea4d

Browse files
Merge pull request #6 from nicolasstucki/update/3.0.0-M3
Update to 3.0.0-M3
2 parents 3c73a6c + dae198f commit ec7ea4d

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ script:
1313
## This runs the template with the default parameters, and runs test within the templated app.
1414
- sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test
1515

16-
- pushd target/sbt-test/dotty-tasty-inspector-template/scripted
16+
- pushd target/sbt-test/scala3-tasty-inspector-template/scripted
1717
- sbt inspector/run test
1818
- popd
1919

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
lazy val root = project
55
.in(file("."))
66
.settings(
7-
name := "dotty-tasty-inspector-template",
7+
name := "scala3-tasty-inspector-template",
88
test in Test := {
99
val _ = (g8Test in Test).toTask("").value
1010
},

src/main/g8/build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
val dottyVersion = "3.0.0-M2"
1+
val scala3Version = "3.0.0-M3"
22

33
lazy val lib = project
44
.in(file("lib"))
55
.settings(
66
name := "lib",
77
version := "0.1.0",
88

9-
scalaVersion := dottyVersion,
9+
scalaVersion := scala3Version,
1010

1111
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
1212
)
@@ -17,10 +17,10 @@ lazy val inspector = project
1717
name := "inspector",
1818
version := "0.1.0",
1919

20-
scalaVersion := dottyVersion,
20+
scalaVersion := scala3Version,
2121

2222
libraryDependencies ++= Seq(
23-
"org.scala-lang" %% "scala3-tasty-inspector" % dottyVersion,
23+
"org.scala-lang" %% "scala3-tasty-inspector" % scala3Version,
2424
"com.novocode" % "junit-interface" % "0.11" % "test"
2525
)
2626
)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package inspector
33
import scala.quoted._
44

55
@main def run =
6-
val tastyFile = "lib/target/scala-3.0.0-M2/classes/lib/Greetings.tasty"
6+
val tastyFile = "lib/target/scala-3.0.0-M3/classes/lib/Greetings.tasty"
77
val tastyContents = Inspector.showCodeOf(tastyFile)
88
println(tastyContents)
9-

src/main/g8/inspector/src/test/scala/inspector/Test.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class InspectorTest {
1414
| def hello(name: scala.Predef.String): scala.Predef.String = "Hello ".+(name)
1515
| }
1616
|}""".stripMargin,
17-
Inspector.showCodeOf("lib/target/scala-3.0.0-M2/classes/lib/Greetings.tasty")
17+
Inspector.showCodeOf("lib/target/scala-3.0.0-M3/classes/lib/Greetings.tasty")
1818
)
1919

2020
}

src/main/g8/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
1+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.0")

0 commit comments

Comments
 (0)