diff --git a/README.md b/README.md index 9c304b7..b03aca4 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# [Play Datomisca](http://pellucidanalytics.github.com/datomisca), Play! Framework 2.2 module for [Datomic](http://www.datomic.com) +# [Play Datomisca](http://dwhjames.github.com/datomisca), Play! Framework 2.3 module for [Datomic](http://www.datomic.com) -[Datomisca](http://pellucidanalytics.github.com/datomisca) is a Scala driver for [Datomic](http://www.datomic.com) +[Datomisca](http://dwhjames.github.com/datomisca) is a Scala driver for [Datomic](http://www.datomic.com) -[Play Datomisca](https://github.com/pellucidanalytics/play-datomisca) is a module for [Play Framework](http://www.playframework.org) which allows using Datomisca in Play in a seamless way. +[Play Datomisca](https://github.com/dwhjames/play-datomisca) is a module for [Play Framework](http://www.playframework.org) which allows using Datomisca in Play in a seamless way. For now, it's quite raw not providing much more on top of Datomisca but more features should be added progressively to configure Datomic for ex. diff --git a/build.sbt b/build.sbt index decf647..ab29d36 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ -organization in ThisBuild := "com.pellucid" +organization in ThisBuild := "com.github.dwhjames" licenses in ThisBuild += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")) -version in ThisBuild := "0.7-alpha-4" +version in ThisBuild := "0.7-RC1" @@ -11,8 +11,9 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature", "-unchecked") resolvers in ThisBuild ++= Seq( - "Typesafe repository releases" at "http://repo.typesafe.com/typesafe/releases/", - "Pellucid Bintray" at "http://dl.bintray.com/content/pellucid/maven" + Resolver.typesafeRepo("releases"), + Resolver.bintrayRepo("dwhjames", "maven"), + "clojars" at "https://clojars.org/repo" ) diff --git a/datomisca-play-json/build.sbt b/datomisca-play-json/build.sbt index f023b3d..9e4b8c4 100644 --- a/datomisca-play-json/build.sbt +++ b/datomisca-play-json/build.sbt @@ -1,9 +1,9 @@ name := "datomisca-play-json" -scalaVersion := "2.11.1" +scalaVersion := "2.11.5" -crossScalaVersions := Seq("2.10.4", "2.11.1") +crossScalaVersions := Seq("2.10.4", "2.11.5") libraryDependencies ++= { import Dependencies.Compile._ diff --git a/datomisca-play-plugin/build.sbt b/datomisca-play-plugin/build.sbt index a13c22a..4c41f1f 100644 --- a/datomisca-play-plugin/build.sbt +++ b/datomisca-play-plugin/build.sbt @@ -1,9 +1,9 @@ name := "datomisca-play-plugin" -scalaVersion := "2.11.1" +scalaVersion := "2.11.5" -crossScalaVersions := Seq("2.10.4", "2.11.1") +crossScalaVersions := Seq("2.10.4", "2.11.5") libraryDependencies ++= { import Dependencies.Compile._ diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 669c03d..2bee36f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,10 +4,10 @@ object Dependencies { object V { // compile - val datomic = "0.9.4766.16" - val datomisca = "0.7-alpha-11" - val play23 = "2.3.1" - val play22 = "2.2.3" + val datomic = "0.9.5130" + val datomisca = "0.7-RC1" + val play23 = "2.3.7" + val play22 = "2.2.6" // test val specs2 = "2.3.12" @@ -15,7 +15,7 @@ object Dependencies { object Compile { val datomic = "com.datomic" % "datomic-free" % V.datomic % "provided" exclude("org.slf4j", "slf4j-nop") exclude("org.jboss.netty", "netty") - val datomisca = "com.pellucid" %% "datomisca" % V.datomisca + val datomisca = "com.github.dwhjames" %% "datomisca" % V.datomisca val play23 = "com.typesafe.play" %% "play" % V.play23 val play22 = "com.typesafe.play" %% "play" % V.play22 } diff --git a/project/Publish.scala b/project/Publish.scala index fe8eda9..8d6f55a 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -4,7 +4,5 @@ import Keys._ object Publish { val publishSettings: Seq[Setting[_]] = - bintray.Plugin.bintraySettings :+ ( - bintray.Keys.bintrayOrganization in (bintray.Keys.bintray) := Some("pellucid") - ) + bintray.Plugin.bintraySettings } diff --git a/project/build.properties b/project/build.properties index 0974fce..748703f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.0 +sbt.version=0.13.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 9238b93..01ca883 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.1") +addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.2")