Skip to content

Commit

Permalink
Merge pull request #52 from cchantep/feature/bump-1.0.40
Browse files Browse the repository at this point in the history
Bump to 1.0.40
  • Loading branch information
cchantep authored Oct 9, 2016
2 parents a46f018 + f4699b3 commit 09ddddf
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.0.39

Fix the ReactiveMongo module

## 1.0.38

Update to ReactiveMongo 0.12-RC4
Expand Down
2 changes: 1 addition & 1 deletion project/Acolyte.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Acolyte extends Build with Dependencies with Format
jdbcDriver, jdbcScala, jdbcClojure, studio).
settings(
organization in ThisBuild := "org.eu.acolyte",
version in ThisBuild := s"1.0.39${versionVariant}",
version in ThisBuild := s"1.0.40${versionVariant}",
javaOptions in ThisBuild ++= Seq(
"-source", javaVersion, "-target", javaVersion),
scalaVersion in ThisBuild := "2.11.8",
Expand Down
2 changes: 1 addition & 1 deletion project/ReactiveMongo.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ trait ReactiveMongo { deps: Dependencies with Format ⇒
},
resolvers ++= reactiveResolvers,
libraryDependencies ++= Seq(
"org.reactivemongo" %% "reactivemongo" % "0.12-RC4" % "provided",
"org.reactivemongo" %% "reactivemongo" % "0.12-RC5" % "provided",
"com.jsuereth" %% "scala-arm" % "1.4",
"org.slf4j" % "slf4j-simple" % "1.7.13" % Test,
"com.chuusai" % "shapeless" % "2.0.0" % Test cross CrossVersion.
Expand Down
2 changes: 1 addition & 1 deletion site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eu.acolyte</groupId>
<artifactId>acolyte</artifactId>
<version>1.0.39</version>
<version>1.0.40</version>
<packaging>pom</packaging>
<name>Acolyte</name>

Expand Down
2 changes: 1 addition & 1 deletion studio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<artifactId>studio</artifactId>
<packaging>jar</packaging>
<name>Acolyte Studio</name>
<version>1.0.39</version>
<version>1.0.40</version>
<url>https://github.com/cchantep/acolyte/</url>

<scm>
Expand Down

0 comments on commit 09ddddf

Please sign in to comment.