Permalink
Browse files

Upgrade dependencies

  • Loading branch information...
1 parent b200811 commit 53041ff12ab36c2319d10babbfe45e59f358d29f @sirthias committed Feb 26, 2015
View
@@ -8,7 +8,7 @@ organization := "org.pegdown"
organizationHomepage := Some(new URL("http://pegdown.org"))
-description := "A Java 1.5+ library providing a clean and lightweight markdown processor"
+description := "A Java 1.6+ library providing a clean and lightweight markdown processor"
startYear := Some(2009)
@@ -17,29 +17,27 @@ licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.
javacOptions ++= Seq(
"-g", // required for byte-code rewriting in parboiled-java!
"-deprecation",
- "-target", "1.5",
- "-source", "1.5",
+ "-target", "1.6",
+ "-source", "1.6",
"-encoding", "utf8",
"-Xlint:unchecked"
)
javacOptions in doc := Seq(
- "-source", "1.5",
+ "-source", "1.6",
"-encoding", "utf8"
)
-scalaVersion := "2.9.3"
+scalaVersion := "2.11.5"
scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8")
libraryDependencies ++= Seq(
- "org.parboiled" % "parboiled-java" % "1.1.6",
+ "org.parboiled" % "parboiled-java" % "1.1.7",
"net.sf.jtidy" % "jtidy" % "r938" % "test",
- "org.specs2" %% "specs2" % "1.12.4.1" % "test"
+ "org.specs2" %% "specs2-core" % "2.4.16" % "test"
)
-resolvers += Opts.resolver.sonatypeReleases
-
// publishing
crossPaths := false
@@ -1 +1 @@
-sbt.version=0.12.4
+sbt.version=0.13.7
View
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
@@ -1,6 +1,7 @@
package org.pegdown
import java.io.{StringWriter, StringReader}
+import org.specs2.matcher.MatchResult
import org.specs2.mutable.Specification
import org.w3c.tidy.Tidy
import org.parboiled.common.FileUtils
@@ -11,12 +12,13 @@ import ast.Node
abstract class AbstractPegDownSpec extends Specification {
- def test(testName: String)(implicit processor: PegDownProcessor) {
+ def test(testName: String)(implicit processor: PegDownProcessor): MatchResult[String] = {
implicit val htmlSerializer = new ToHtmlSerializer(new LinkRenderer)
testWithSerializer(testName)
}
- def test(testName: String, expectedOutput: String, htmlSerializer: ToHtmlSerializer = null)(implicit processor: PegDownProcessor) {
+ def test(testName: String, expectedOutput: String, htmlSerializer: ToHtmlSerializer = null)
+ (implicit processor: PegDownProcessor): MatchResult[String] = {
val markdown = FileUtils.readAllCharsFromResource(testName + ".md")
require(markdown != null, "Test '" + testName + "' not found")
@@ -38,13 +40,13 @@ abstract class AbstractPegDownSpec extends Specification {
normalize(tidyHtml) === normalize(expectedOutput)
}
- def testWithSerializer(testName: String)(implicit processor: PegDownProcessor, htmlSerializer: ToHtmlSerializer) {
+ def testWithSerializer(testName: String)(implicit processor: PegDownProcessor, htmlSerializer: ToHtmlSerializer) = {
val expectedUntidy = FileUtils.readAllTextFromResource(testName + ".html")
require(expectedUntidy != null, "Test '" + testName + "' not found")
test(testName, tidy(expectedUntidy), htmlSerializer)
}
- def testAST(testName: String)(implicit processor: PegDownProcessor) {
+ def testAST(testName: String)(implicit processor: PegDownProcessor) = {
val markdown = FileUtils.readAllCharsFromResource(testName + ".md")
require(markdown != null, "Test '" + testName + "' not found")
@@ -8,7 +8,7 @@ class Markdown103Spec extends AbstractPegDownSpec {
"The PegDownProcessor" should {
"pass the Markdown test suite" in {
- def runMarkdownTestSuite(implicit processor: PegDownProcessor) {
+ def runMarkdownTestSuite(implicit processor: PegDownProcessor) = {
test("MarkdownTest103/Amps and angle encoding")
test("MarkdownTest103/Auto links")
test("MarkdownTest103/Backslash escapes")
@@ -15,7 +15,7 @@ class PegDownSpec extends AbstractPegDownSpec {
"The PegDownProcessor" should {
"pass the custom pegdown tests for all extensions" in {
- def runSuite(implicit processor: PegDownProcessor) {
+ def runSuite(implicit processor: PegDownProcessor) = {
test("pegdown/Abbreviations")
test("pegdown/AttributeWithUnderscore")
test("pegdown/AnchorLinks")
@@ -98,7 +98,7 @@ class PegDownSpec extends AbstractPegDownSpec {
}
"pass the custom verbatim-serializer test" in {
- def runWithSerializerMap(testName: String, verbatimSerializerMap: java.util.Map[String, VerbatimSerializer], suffix: String) {
+ def runWithSerializerMap(testName: String, verbatimSerializerMap: java.util.Map[String, VerbatimSerializer], suffix: String) = {
val expectedUntidy = FileUtils.readAllTextFromResource(testName + suffix + ".html")
require(expectedUntidy != null, "Test '" + testName + "' not found")
test(testName, tidy(expectedUntidy), new ToHtmlSerializer(new LinkRenderer, verbatimSerializerMap))(new PegDownProcessor(FENCED_CODE_BLOCKS))

0 comments on commit 53041ff

Please sign in to comment.