Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Update to scala 2.8.1 #20

Merged
merged 7 commits into from

2 participants

@n8han

I think this is safe to pull now.

@softprops
Owner

Ill merge it tomorrow night. Noticed some markdown parsing issues the the current that I worked around by hand in the content of my slides tonight. Don't have much more energy now. I really need to publish this guy. Thanks so much for doing this though.

@softprops softprops merged commit 4f2cc3f into softprops:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 21, 2011
  1. @n8han

    scala 2.8.1

    n8han authored
Commits on Jun 27, 2011
  1. @n8han

    Merge branch 'master' of github.com:n8han/picture-show

    n8han authored
    Conflicts:
    	project/build.properties
Commits on Oct 18, 2011
  1. @n8han
  2. @n8han

    build with scala 2.8.1

    n8han authored
  3. @n8han
  4. @n8han

    specs dep for 2.8.1

    n8han authored
  5. @n8han
This page is out of date. Refresh to see the latest.
View
2  core/src/main/scala/Config.scala
@@ -17,7 +17,7 @@ trait Config { self: IO with Logging =>
def extract[T](name: String)(f: Any => T) = json flatMap { _.flatMap {
case (k, v) if(k == name) => Some(f(v))
case _ => None
- }.firstOption }
+ }.headOption }
json match {
case None => error("invalid json config %s" format(contents))
View
2  core/src/main/scala/IO.scala
@@ -4,7 +4,7 @@ trait IO { self: Resolver =>
import java.net.URL
def exists(path: String) = slurp(path).isDefined
def slurp(path: String) = try {
- Some(scala.io.Source.fromURL(new URL(loadPath, path), "utf-8").getLines.mkString(""))
+ Some(scala.io.Source.fromURL(new URL(loadPath, path), "utf-8").mkString(""))
} catch {
case e: java.io.FileNotFoundException => None
}
View
2  core/src/main/scala/Templates.scala
@@ -15,7 +15,7 @@ trait Templates { self: Config =>
* @note in scala 2.8 you don't need the last to args
*/
def render(heads : xml.NodeBuffer, slides: xml.NodeBuffer, bodyScripts: xml.NodeBuffer) = xml.Xhtml.toXhtml(
- default(heads, slides, bodyScripts), false, false
+ default(heads, slides, bodyScripts)
)
/** builds a collection of nodes */
private def collectionOf(c: Seq[String])(f: String => xml.Node) =
View
2  offline/src/main/scala/offline/Offline.scala
@@ -1,5 +1,7 @@
package pictureshow.offline
+import pictureshow.{Renderer,Files}
+
object Offline {
import java.io.File
View
4 offline/src/main/scala/offline/main.scala
@@ -1,6 +1,6 @@
package pictureshow.offline
-object Main extends Logging {
+object Main extends pictureshow.Logging {
import java.io.{File => JFile}
object Options {
/** path to show */
@@ -41,7 +41,7 @@ object Main extends Logging {
val js = "show" :: "jquery.min" :: "prettify/prettify" :: langs map { "/js/%s.js" format _ }
val css = "show" :: "prettify" :: Nil map { "/css/%s.css" format _ }
val assets = js ++ css map { p => getClass().getResource(p.format("show")) }
- Right(() => Offline(show.getAbsolutePath, assets.elements, out))
+ Right(() => Offline(show.getAbsolutePath, assets.iterator, out))
}
}
View
3  project/build.properties
@@ -1,3 +0,0 @@
-#Project properties
-#Sun Jun 13 17:27:32 EDT 2010
-sbt.version=0.10.1
View
8 project/build.scala
@@ -8,7 +8,7 @@ object build extends Build {
lazy val standardSettings = Defaults.defaultSettings ++ Seq(
organization := "me.lessis",
version := "0.1.0-SNAPSHOT",
- scalaVersion := "2.7.7",
+ scalaVersion := "2.8.1",
libraryDependencies += knockoff
)
@@ -60,10 +60,10 @@ object build extends Build {
object Deps {
- val knockoff = "net.databinder" %% "pamflet-knockoff" % "0.2.2"
+ val knockoff = "net.databinder" %% "pamflet-knockoff" % "0.2.5"
val codec = "commons-codec" % "commons-codec" % "1.4"
- val specs = "org.scala-tools.testing" % "specs" % "1.6.2.2" % "test"
- val uf_version = "0.3.3"
+ val specs = "org.scala-tools.testing" %% "specs" % "1.6.8" % "test"
+ val uf_version = "0.5.1"
val uff = "net.databinder" %% "unfiltered-filter" % uf_version
val ufj = "net.databinder" %% "unfiltered-jetty" % uf_version
val launch = "org.scala-tools.sbt" % "launcher-interface" % "0.7.4" % "provided"
View
3  project/plugins/build.sbt
@@ -1,3 +0,0 @@
-libraryDependencies <+= (sbtVersion) { sv =>
- "net.databinder" %% "posterous-sbt" % ("0.3.0_sbt" + sv)
-}
View
2  src/main/conscript/pshow/launchconfig
@@ -4,7 +4,7 @@
name: pictureshow-conscript
class: pictureshow.PictureShowScript
[scala]
- version: 2.7.7
+ version: 2.8.1
[repositories]
less:http://repo.lessis.me
local
Something went wrong with that request. Please try again.