Skip to content
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

Try mdoc #1

Merged
merged 4 commits into from
Oct 31, 2019
Merged
Show file tree
Hide file tree
Changes from 2 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
25 changes: 14 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,23 @@ lazy val baseSettings: Seq[Setting[_]] = Seq(
lazy val intro = project.in(file("."))
.settings(moduleName := "scala-intro")
.settings(baseSettings: _*)
.aggregate(core, slides)
.dependsOn(core, slides)
.aggregate(core, docs)
.dependsOn(core, docs)

lazy val core = project
.settings(moduleName := "scala-intro-core")
.settings(baseSettings: _*)

lazy val docs = project.in(file("slides2"))
.dependsOn(core)
julien-truffaut marked this conversation as resolved.
Show resolved Hide resolved
.enablePlugins(MdocPlugin)

lazy val slides = project
.settings(moduleName := "scala-intro-slides")
.settings(baseSettings: _*)
.settings(
tutSourceDirectory := baseDirectory.value / "tut",
tutTargetDirectory := baseDirectory.value / "../docs",
watchSources ++= (tutSourceDirectory.value ** "*.html").get
).dependsOn(core)
.enablePlugins(TutPlugin)
//lazy val slides = project
// .settings(moduleName := "scala-intro-slides")
// .settings(baseSettings: _*)
// .settings(
// tutSourceDirectory := baseDirectory.value / "tut",
// tutTargetDirectory := baseDirectory.value / "../docs",
// watchSources ++= (tutSourceDirectory.value ** "*.html").get
// ).dependsOn(core)
// .enablePlugins(TutPlugin)
62 changes: 3 additions & 59 deletions docs/data.html → docs/data.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,68 +50,12 @@
</div>

---
# Trait
# Test

```scala
trait Console {
def writeLine(message: String): Unit
}
```scala mdoc
val x = 1
```

--

```scala
val std = new Console {
def writeLine(message: String): Unit =
println(message)
}

val std2: Console = std
```

--

```scala
scala> std
res0: Console = $anon$1@5b89b779

scala> std.writeLine("Hello World!")
Hello World!
```

---
# Trait with implementation

```scala
trait Console {
def writeLine(message: String): Unit

def writeInt(value: Int): Unit =
writeLine(value.toString)
}

val std = new Console {
def writeLine(message: String): Unit =
println(message)
}
```

```scala
scala> std.writeLine("Hello World!")
Hello World!

scala> std.writeInt(10)
10
```

---
# Trait composition

```scala
trait EmptyTrait

trait Foo extends EmptyTrait with Console
```

---
class: center, middle
Expand Down
123 changes: 0 additions & 123 deletions docs/index.html

This file was deleted.

1 change: 0 additions & 1 deletion project/buid.properties

This file was deleted.

2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.3.3
3 changes: 2 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.12")
//addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.12")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.4.0-RC2")