Skip to content

Commit

Permalink
update for 0.7 release candidate 1
Browse files Browse the repository at this point in the history
  • Loading branch information
dwhjames committed Feb 23, 2015
1 parent 934829b commit 3cb0ad0
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 21 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@

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"



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"
)


Expand Down
4 changes: 2 additions & 2 deletions datomisca-play-json/build.sbt
Original file line number Diff line number Diff line change
@@ -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._
Expand Down
4 changes: 2 additions & 2 deletions datomisca-play-plugin/build.sbt
Original file line number Diff line number Diff line change
@@ -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._
Expand Down
10 changes: 5 additions & 5 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ 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"
}

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
}
Expand Down
4 changes: 1 addition & 3 deletions project/Publish.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.0
sbt.version=0.13.7
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.1")
addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.2")

0 comments on commit 3cb0ad0

Please sign in to comment.