Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build 0.8.4 for Scala 2.12 #338

Closed
wants to merge 8 commits into from
Closed

Build 0.8.4 for Scala 2.12 #338

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2be06d2
Prepare Scala 2.12 build of unfiltered 0.8.4
ashawley Nov 29, 2016
10dbbf2
Build Scala 2.12 as unfiltered-0.8.4-RC1
ashawley Nov 30, 2016
0ea8940
Drop dispatch dependencies to build in Scala 2.12
ashawley Nov 30, 2016
3f1dfae
Drop tubesocks dependency to build in Scala 2.12
ashawley Nov 30, 2016
d024548
Disable specs2 and scalatest modules for build in Scala 2.12
ashawley Nov 30, 2016
28ad935
Change Travis for 0.8.4-RC1
ashawley Dec 1, 2016
cef88ff
Update scalatest to a 2.12 build
ashawley Dec 1, 2016
a33690d
Run publish with Travis for 0.8.4-RC1
ashawley Dec 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions directives/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ description := "monadic api for unfiltered"

unmanagedClasspath in (local("directives"), Test) <++=
(fullClasspath in (local("specs2"), Compile))


libraryDependencies +=
"net.databinder.dispatch" %% "dispatch-core" % "0.11.0" % "test"
2 changes: 1 addition & 1 deletion json4s/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ unmanagedClasspath in (local("json4s"), Test) <++=
}

libraryDependencies <++= scalaVersion( sv =>
Seq("org.json4s" %% "json4s-native" % "3.2.9") ++ Common.integrationTestDeps(sv)
Seq("org.json4s" %% "json4s-native" % "3.4.2") ++ Common.integrationTestDeps(sv)
)
2 changes: 1 addition & 1 deletion library/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ libraryDependencies <++= scalaVersion(v => Seq(
libraryDependencies <<= (libraryDependencies, scalaVersion){
(dependencies, scalaVersion) =>
if(!(scalaVersion.startsWith("2.9") || scalaVersion.startsWith("2.10")))
("org.scala-lang.modules" %% "scala-xml" % "1.0.1") +: dependencies
("org.scala-lang.modules" %% "scala-xml" % "1.0.5") +: dependencies
else
dependencies
}
2 changes: 0 additions & 2 deletions netty-websockets/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ unmanagedClasspath in (local("netty-websockets"), Test) <++=
(fullClasspath in (local("specs2"), Compile))

libraryDependencies <++= scalaVersion(Common.integrationTestDeps _)

libraryDependencies += "me.lessis" %% "tubesocks" % "0.1.0" % "test"// exclude("io.netty", "netty")
1 change: 0 additions & 1 deletion oauth/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ unmanagedClasspath in (local("oauth"), Test) <++=
(fullClasspath in (local("specs2"), Compile))

libraryDependencies <++= scalaVersion(v =>
Seq(Common.dispatchOAuthDep % "test") ++
Common.integrationTestDeps(v)
)
2 changes: 1 addition & 1 deletion project/build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ object Unfiltered extends Build {
library, filters, filtersAsync , uploads, filterUploads,
nettyUploads, util, jetty,
jettyAjpProject, netty, nettyServer, json4s,
specs2Helpers, scalaTestHelpers, websockets, oauth, mac,
websockets, oauth, mac,
oauth2, agents, directives)

lazy val library: Project =
Expand Down
8 changes: 4 additions & 4 deletions project/common.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object Common {
def specs2Dep(sv: String) =
sv.split("[.-]").toList match {
case "2" :: "9" :: _ => "org.specs2" %% "specs2" % "1.12.4.1"
case _ => "org.specs2" %% "specs2" % "2.3.11"
case _ => "org.specs2" %% "specs2" % "2.4.17"
}


Expand All @@ -21,14 +21,14 @@ object Common {
def dispatchOAuthDep =
"net.databinder" %% "dispatch-oauth" % dispatchVersion

def integrationTestDeps(sv: String) = (specs2Dep(sv) :: dispatchDeps) map { _ % "test" }
def integrationTestDeps(sv: String) = (specs2Dep(sv) :: Nil) map { _ % "test" }

val settings: Seq[Setting[_]] = Defaults.coreDefaultSettings ++ Seq(
organization := "net.databinder",

version := "0.8.4",
version := "0.8.4-RC1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.8.4 already released http://repo1.maven.org/maven2/net/databinder/unfiltered-filter_2.11/0.8.4/ but missing tag #334
I think next version should not "0.8.4-RC1".

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Building a Scala 2.12 for 0.8.4 should definitely be a release candidate, for now, since the test suite can't be run in Scala 2.12. A 0.8.4-RC1 will still be useful.


crossScalaVersions := Seq("2.11.2", "2.10.4"),
crossScalaVersions := Seq("2.12.0" ,"2.11.2", "2.10.4"),

scalaVersion := crossScalaVersions.value.head,

Expand Down
2 changes: 1 addition & 1 deletion scalatest/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description := "Facilitates testing Unfiltered servers with ScalaTest"

libraryDependencies ++= Common.dispatchDeps :+ "org.scalatest" %% "scalatest" % "2.2.1"
libraryDependencies += "org.scalatest" %% "scalatest" % "2.2.1"
2 changes: 1 addition & 1 deletion specs2/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
description := "Facilitates testing Unfiltered servers with Specs2"

libraryDependencies <++= scalaVersion { v =>
Common.specs2Dep(v) :: Common.dispatchDeps
Common.specs2Dep(v) :: Nil
}