Skip to content

Commit

Permalink
Updated library to work with
Browse files Browse the repository at this point in the history
* sbt-0.12 (instead of maven)
* scala-2.9 (instead of 2.8)
* markdown4j-2.2 (instead of 1.1)
  • Loading branch information
laughedelic committed Jul 21, 2013
1 parent e33349e commit 60f9077
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 146 deletions.
20 changes: 20 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name := "scalocco"

organization := "me.grison.scalocco"

description := "Scalocco: A Docco implementation in Scala"

homepage := Some(url("http://www.grison.me/scalocco/"))

startYear := Some(2013)

// licenses += ???

version := "1.1.0-SNAPSHOT"

scalaVersion := "2.9.3"

scalacOptions ++= Seq(
"-unchecked"
, "-deprecation"
)
Binary file added lib/markdown4j-2.2.jar
Binary file not shown.
Binary file removed libs/markdown4j-1.1.jar
Binary file not shown.
144 changes: 0 additions & 144 deletions pom.xml

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/scala/me/grison/scalocco/Scalocco.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import io.Source
import java.util.UUID

//#### Import for processing Markdown ####
import com.petebevin.markdown.MarkdownProcessor;
import org.markdown4j.Markdown4jProcessor

//### Section class###
// The `Section` class is just an object having two fields to represent
Expand All @@ -55,7 +55,7 @@ case class Section(doc: String, code: String)
class Markdown {
class MarkdownableString(s: String) {
// *Markdownify* the given text.
def markdown = new MarkdownProcessor().markdown(s)
def markdown = new Markdown4jProcessor().process(s)
// *Markdownify* the given text but removes the `<p/>` tags from the result
def mkdNoP = markdown.replaceAll("</?p>", "").trim()
// Creates a *Mustache* object whose template is the given String
Expand Down

0 comments on commit 60f9077

Please sign in to comment.