diff --git a/README.md b/README.md index f651895..e8506b6 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ sbt.version=0.13.7 ```scala resolvers += bintray.Opts.resolver.mavenRepo("mandubian") -scalednVersion := "1.0.0-603d10d0e58c3cbc75d7c0321d7401e888e2fb78" +val scalednVersion = "1.0.0-e8180d08620a607ec47613f8c2585f7784e86625" libraryDependencies ++= Seq( // only need scaledn parser? diff --git a/samples/helloedn/build.sbt b/samples/helloedn/build.sbt index 59ff17c..8c965b2 100644 --- a/samples/helloedn/build.sbt +++ b/samples/helloedn/build.sbt @@ -2,11 +2,13 @@ name := "helloedn" resolvers += bintray.Opts.resolver.mavenRepo("mandubian") +val scalednVersion = "1.0.0-e8180d08620a607ec47613f8c2585f7784e86625" + libraryDependencies ++= Seq( // only need scaledn parser? - "com.mandubian" %% "scaledn-parser" % "1.0.0-f77f98cc305ce8a304d8941f800505c6b3d41d74" + "com.mandubian" %% "scaledn-parser" % scalednVersion // only need scaledn validation/serialization? - , "com.mandubian" %% "scaledn-validation" % "1.0.0-f77f98cc305ce8a304d8941f800505c6b3d41d74" + , "com.mandubian" %% "scaledn-validation" % scalednVersion // only need scaledn macros? - , "com.mandubian" %% "scaledn-macros" % "1.0.0-f77f98cc305ce8a304d8941f800505c6b3d41d74" + , "com.mandubian" %% "scaledn-macros" % scalednVersion ) diff --git a/samples/helloedn/src/main/scala/main.scala b/samples/helloedn/src/main/scala/main.scala index c5417d5..07d1374 100644 --- a/samples/helloedn/src/main/scala/main.scala +++ b/samples/helloedn/src/main/scala/main.scala @@ -1,35 +1,30 @@ -// import scaledn._ -// import macros._ -// import write._ -// object HelloEDN { -// def main(args: Array[String]) { -// val edn = EDN("""{"foo" 1, "bar" true, "baz" (1.2 2.3 3.4)}""") -// println("EDN:"+edn) -// assert(toEDNString(edn) == """{"foo" 1, "bar" true, "baz" (1.2 2.3 3.4)}""") -// } -// } - - -package yo +import shapeless._ import scaledn._ import parser._ import macros._ import validate._ -import shapeless._ +import write._ + -// import play.api.data.mapping._ +object HelloEDN { + def main(args: Array[String]) { + val edn = EDN("""{"foo" 1, "bar" true, "baz" (1.2 2.3 3.4)}""") + println("EDN:"+edn) + assert(toEDNString(edn) == """{"foo" 1, "bar" true, "baz" (1.2 2.3 3.4)}""") + } +} -object HelloEDN extends App { - case class Address(lat:Double, lon:Double) - case class Person (name:String, addr:Address) +// object HelloEDN extends App { +// case class Address(lat:Double, lon:Double) +// case class Person (name:String, addr:Address) - val data = """#yo.helloedn/Person {:name "yo", - :addr #yo.helloedn/Address {:lat 0.0, :lon 0.0}}""" +// val data = """#yo.helloedn/Person {:name "yo", +// :addr #yo.helloedn/Address {:lat 0.0, :lon 0.0}}""" - println(parseEDN(data).map(validate[Person])) +// println(parseEDN(data).map(validateEDN[Person])) -} \ No newline at end of file +// } \ No newline at end of file