Skip to content

Commit a1339c4

Browse files
authored
Merge pull request #32 from alvinj/change-dotty-refs-to-scala3
2 parents 48adc20 + 5ff180d commit a1339c4

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

src/main/g8/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
## sbt project compiled with Dotty
1+
## sbt project compiled with Scala 3
22

33
### Usage
44

5-
This is a normal sbt project, you can compile code with `sbt compile` and run it
6-
with `sbt run`, `sbt console` will start a Dotty REPL.
5+
This is a normal sbt project. You can compile code with `sbt compile`, run it with `sbt run`, and `sbt console` will start a Scala 3 REPL.
76

87
For more information on the sbt-dotty plugin, see the
98
[dotty-example-project](https://github.com/lampepfl/dotty-example-project/blob/master/README.md).

src/main/g8/build.sbt

Lines changed: 3 additions & 3 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-M2"
22

33
lazy val root = project
44
.in(file("."))
55
.settings(
6-
name := "dotty-simple",
6+
name := "scala3-simple",
77
version := "0.1.0",
88

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

1111
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
1212
)

src/main/g8/default.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
name=Dotty Project Template
2-
description=A template to demonstrate a minimal Dotty application
1+
name=Scala 3 Project Template
2+
description=A template to demonstrate a minimal Scala 3 application

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
def main(args: Array[String]): Unit = {
22
println("Hello world!")
33
println(msg)
4-
}
4+
}
55

6-
def msg = "I was compiled by dotty :)"
6+
def msg = "I was compiled by Scala 3. :)"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ import org.junit.Assert._
44

55
class Test1 {
66
@Test def t1(): Unit = {
7-
assertEquals("I was compiled by dotty :)", msg)
7+
assertEquals("I was compiled by Scala 3. :)", msg)
88
}
99
}

0 commit comments

Comments
 (0)