Skip to content

Changed most Dotty references to Scala 3 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2020
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
5 changes: 2 additions & 3 deletions src/main/g8/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
## sbt project compiled with Dotty
## sbt project compiled with Scala 3

### Usage

This is a normal sbt project, you can compile code with `sbt compile` and run it
with `sbt run`, `sbt console` will start a Dotty REPL.
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.

For more information on the sbt-dotty plugin, see the
[dotty-example-project](https://github.com/lampepfl/dotty-example-project/blob/master/README.md).
6 changes: 3 additions & 3 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-M2"

lazy val root = project
.in(file("."))
.settings(
name := "dotty-simple",
name := "scala3-simple",
version := "0.1.0",

scalaVersion := dottyVersion,
scalaVersion := scala3Version,

libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
)
4 changes: 2 additions & 2 deletions src/main/g8/default.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name=Dotty Project Template
description=A template to demonstrate a minimal Dotty application
name=Scala 3 Project Template
description=A template to demonstrate a minimal Scala 3 application
4 changes: 2 additions & 2 deletions src/main/g8/src/main/scala/Main.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
def main(args: Array[String]): Unit = {
println("Hello world!")
println(msg)
}
}

def msg = "I was compiled by dotty :)"
def msg = "I was compiled by Scala 3. :)"
2 changes: 1 addition & 1 deletion src/main/g8/src/test/scala/Test1.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import org.junit.Assert._

class Test1 {
@Test def t1(): Unit = {
assertEquals("I was compiled by dotty :)", msg)
assertEquals("I was compiled by Scala 3. :)", msg)
}
}