Merge pull request #11 from websudos/release/maven_central

Release/maven central
outworkers · May 10, 2015 · 05df594 · 05df594
2 parents bc82927 + ce23b83
commit 05df594
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,8 @@
 language: scala
 
 scala:
- - "2.10.4"
+ - "2.10.5"
+ - "2.11.6"
 
 # Emails to notify
 notifications:
@@ -25,5 +26,7 @@ jdk:
   - oraclejdk7
   - openjdk7
 
+before_script: travis_retry sbt ++$TRAVIS_SCALA_VERSION update
+
 script: "sbt \"test-only * -- -l RequiresNeo4jServer\""
 
diff --git a/project/Build.scala → project/ReactiveNeoBuild.scala b/project/Build.scala → project/ReactiveNeoBuild.scala
@@ -19,21 +19,19 @@ import sbt._
 import scoverage.ScoverageSbtPlugin.instrumentSettings
 import org.scalastyle.sbt.ScalastylePlugin
 
-object reactiveneo extends Build {
+object ReactiveNeoBuild extends Build {
 
-  val scalaMajorVersion = "2.11"
-  val scalaMinorVersion = "6"
-  val scalaFullVersion = scalaMajorVersion + "." + scalaMinorVersion
-
-  val FinagleVersion = "6.24.0"
-  val playVersion = "2.3.7"
-  val ScalatestVersion = "2.2.1"
+  val UtilVersion = "0.8.0"
+  val ScalatestVersion = "2.2.4"
+  val ShapelessVersion = "2.2.0-RC4"
+  val FinagleVersion = "6.25.0"
+  val TwitterUtilVersion = "6.24.0"
+  val FinagleZookeeperVersion = "6.24.0"
+  val playVersion = "2.3.4"
   val ScalazVersion = "7.1.0"
   val Neo4jVersion = "2.1.7"
 
-  val publishUrl = "http://maven.websudos.co.uk"
-
-  val mavenPublishSettings : Seq[Def.Setting[_]] = Seq(
+  val publishSettings : Seq[Def.Setting[_]] = Seq(
     credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"),
     publishMavenStyle := true,
     publishTo <<= version.apply {
@@ -47,7 +45,7 @@ object reactiveneo extends Build {
     publishArtifact in Test := false,
     pomIncludeRepository := { _ => true },
     pomExtra :=
-      <url>https://github.com/websudosuk/reactiveneo</url>
+      <url>https://github.com/websudos/reactiveneo</url>
         <licenses>
           <license>
             <name>Apache License, Version 2.0</name>
@@ -56,8 +54,8 @@ object reactiveneo extends Build {
           </license>
         </licenses>
         <scm>
-          <url>git@github.com:websudosuk/reactiveneo.git</url>
-          <connection>scm:git:git@github.com:websudosuk/reactiveneo.git</connection>
+          <url>git@github.com:websudos/reactiveneo.git</url>
+          <connection>scm:git:git@github.com:websudos/reactiveneo.git</connection>
         </scm>
         <developers>
           <developer>
@@ -73,24 +71,11 @@ object reactiveneo extends Build {
         </developers>
   )
 
-  val publishSettings : Seq[Def.Setting[_]] = Seq(
-    credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"),
-    publishTo <<= version { (v: String) => {
-        if (v.trim.endsWith("SNAPSHOT"))
-          Some("snapshots" at publishUrl + "/ext-snapshot-local")
-        else
-          Some("releases"  at publishUrl + "/ext-release-local")
-      }
-    },
-    publishMavenStyle := true,
-    publishArtifact in Test := false,
-    pomIncludeRepository := { _ => true }
-  )
-
   val sharedSettings: Seq[Def.Setting[_]] = Seq(
     organization := "com.websudos",
-    version := "0.1.2",
-    scalaVersion := scalaFullVersion,
+    version := "0.2.0",
+    scalaVersion := "2.10.5",
+    crossScalaVersions := Seq("2.10.5", "2.11.6"),
     resolvers ++= Seq(
       "Typesafe repository snapshots" at "http://repo.typesafe.com/typesafe/snapshots/",
       "Typesafe repository releases" at "http://repo.typesafe.com/typesafe/releases/",
@@ -116,6 +101,7 @@ object reactiveneo extends Build {
       "-unchecked"
      ),
     libraryDependencies ++= Seq(
+      "com.chuusai"                  %% "shapeless"                         % ShapelessVersion,
       "com.github.nscala-time"       %% "nscala-time"                       % "1.0.0",
       "com.typesafe.scala-logging"   %% "scala-logging-slf4j"               % "2.1.2",
       "org.scalaz"                   %% "scalaz-scalacheck-binding"         % ScalazVersion       % "test",
@@ -144,13 +130,14 @@ object reactiveneo extends Build {
   ).settings(
     name := "reactiveneo-dsl",
     libraryDependencies ++= Seq(
-      "org.scala-lang"               %  "scala-reflect"                     % scalaFullVersion,
+      "com.chuusai"                  %% "shapeless"                         % ShapelessVersion,
+      "org.scala-lang"               %  "scala-reflect"                     % "2.10.4",
       "com.twitter"                  %% "finagle-http"                      % FinagleVersion,
-      "com.twitter"                  %% "util-core"                         % "6.23.0",
+      "com.twitter"                  %% "util-core"                         % TwitterUtilVersion,
       "joda-time"                    %  "joda-time"                         % "2.3",
       "org.joda"                     %  "joda-convert"                      % "1.6",
       "com.typesafe.play"            %% "play-json"                         % playVersion,
-      "org.neo4j"                    % "neo4j-cypher"                       % Neo4jVersion
+      "net.liftweb"                  %% "lift-json"                         % "2.6-M4"                  % "test, provided"
     )
   ).dependsOn(
     reactiveneoTesting % "test, provided"