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

Reorganized spaces for shapeless 1 and 2 #1

Closed
wants to merge 2 commits into from
Closed

Reorganized spaces for shapeless 1 and 2 #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1179c98
Build both shapeless 1.2.4 and shapless 2.
gkossakowski Apr 9, 2014
224751b
Reorganized spaces for shapeless 1 and 2
Apr 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
193 changes: 113 additions & 80 deletions common-2.11.x.conf
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@ vars: {
// forked to make build dbuild friendly (only building lift-json)
lift-framework-ref : "adriaanm/framework.git#scala-2.11"
// forked so I could remove problematic sbt plugins
spray-ref : "gkossakowski/spray.git#1.3-scala-2.11"
spray-ref : "spray/spray.git#unstable/1.3-scala-2.11"

// only building project twirl-api, fixed sha from master branch that has Scala 2.11 compatiblity patches merged
twirl-ref : "spray/twirl.git#102978cb508684aee0cfa09d71027965cdcd77b4"
Expand Down Expand Up @@ -91,10 +91,6 @@ vars: {
zeromq-scala-binding-ref : "valotrading/zeromq-scala-binding.git#062e9438e322ec29d75b9649cb2aafa6ba3198a6"
// fixed sha/tag (a compromise), the sha points at master that supports Scala 2.11
spire-ref : "non/spire.git#3d2a41e91a1f6946fac63660f6157d4a6e4a281d"
// latest commits in scala-2.11.x branch break spray, Miles has been pinged about it
// TODO: add shapeless 1.2.4 to dbuild definition which should allow us to switch to
// upstream version of spray that depends on shapeless 1.2.4
shapeless-ref : "milessabin/shapeless.git#6dd9ec22b68d6a911ad83d0a537bf2043b748fc2"

// tracking upstream (the ideal)
akka-ref : "akka/akka.git"
Expand All @@ -112,6 +108,8 @@ vars: {
sbt-republish-ref : "typesafehub/sbt-republish.git"
sbt-ref : "sbt/sbt.git#0.13"
scalaz-ref : "scalaz/scalaz.git#series/7.0.x"
shapeless-ref : "milessabin/shapeless.git#shapeless-1.2.4-scala-2.11.x"
shapeless2-ref : "milessabin/shapeless.git#shapeless-2.0.0-scala-2.11.x"
discipline-ref : "typelevel/discipline.git#v0.2"

// version settings
Expand Down Expand Up @@ -165,59 +163,6 @@ build += {
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "lift-json",
uri: "https://github.com/"${vars.lift-framework-ref}
extra.projects: ["lift-json"]
extra.sbt-version: ${vars.sbt-version-override}
// test failure:
//[info] [info] ! Either can't be deserialized with type hints
//[info] [error] ClassNotFoundException: : scala.util.Left (Formats.scala:223)
// !!!: probably we should investigate
extra.run-tests: false
}

${vars.base} {
name: "spray-twirl",
uri: "https://github.com/"${vars.twirl-ref}
extra.projects: ["twirl-api"]
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "spray-json",
uri: "https://github.com/"${vars.spray-json-ref},
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "spray",
uri: "https://github.com/"${vars.spray-ref},
extra: ${vars.base.extra} {
sbt-version: ${vars.sbt-version-override}
// disable running sphinx, it would be great if dbuild
// oferred a mechanism for excluding particular project (e.g. docs)
commands += "set SphinxSupport.sphinxCompile in docs := Seq.empty"
// they fail to compile
run-tests: false
}
}


${vars.base} {
name: "Play2-core",
uri: "https://github.com/"${vars.playframework-ref},
extra: ${vars.base.extra} {
projects: ["Play"]
directory: "framework"
run-tests: false
// workaround for the problem with PlayVersion.scala file is being passed twice to Scala compiler
// and we get double definition error
commands += "set sources in (PlayProject, Compile, compile) := (sources in (PlayProject, Compile, compile)).value.distinct"
}
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "scala-io"
uri: "https://github.com/"${vars.scala-io-ref}
Expand Down Expand Up @@ -254,17 +199,18 @@ build += {
}

${vars.base} {
name: shapeless
// dots are not allowed in names
name: shapeless-1-2-4
uri: "https://github.com/"${vars.shapeless-ref}
extra.sbt-version: ${vars.sbt-version-override}

space.to: default.shapeless1
}

${vars.base} {
name: specs2
uri: "https://github.com/"${vars.specs2-ref}
extra.sbt-version: ${vars.sbt-version-override-next}
extra.run-tests: false // at least SnippetsTest is failing.
name: shapeless2
uri: "https://github.com/"${vars.shapeless2-ref}
extra.sbt-version: ${vars.sbt-version-override}
space.to: default.shapeless2
}

${vars.base} {
Expand Down Expand Up @@ -295,22 +241,6 @@ build += {
}
}

${vars.base} {
name: "discipline"
uri: "https://github.com/"${vars.discipline-ref}
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "spire"
uri: "https://github.com/"${vars.spire-ref}
extra.sbt-version: ${vars.sbt-version-override}
// tests crash with:
// [info] [error] Could not run test spire.laws.LawTests:
// java.lang.ClassFormatError: Duplicate method name&signature in class file spire/std/OrderProductInstances$$anon$228
extra.run-tests: false
}

${vars.base} {
name: "genjavadoc-plugin",
uri: "https://github.com/"${vars.genjavadoc-ref}
Expand Down Expand Up @@ -390,3 +320,106 @@ build += {
}
]
}


//
// Projects that depend on shapeless 2.x.x
//
build += {
space: default.shapeless2
extraction-version: "2.11.0-RC1"
cross-version: disabled
projects: [

${vars.base} {
name: specs2
uri: "https://github.com/"${vars.specs2-ref}
extra.sbt-version: ${vars.sbt-version-override-next}
extra.run-tests: false // at least SnippetsTest is failing.
}

${vars.base} {
name: "spray-twirl",
uri: "https://github.com/"${vars.twirl-ref}
extra.projects: ["twirl-api"]
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "spray-json",
uri: "https://github.com/"${vars.spray-json-ref},
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "lift-json",
uri: "https://github.com/"${vars.lift-framework-ref}
extra.projects: ["lift-json"]
extra.sbt-version: ${vars.sbt-version-override}
// test failure:
//[info] [info] ! Either can't be deserialized with type hints
//[info] [error] ClassNotFoundException: : scala.util.Left (Formats.scala:223)
// !!!: probably we should investigate
extra.run-tests: false
}

${vars.base} {
name: "discipline"
uri: "https://github.com/"${vars.discipline-ref}
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "spire"
uri: "https://github.com/"${vars.spire-ref}
extra.sbt-version: ${vars.sbt-version-override}
// tests crash with:
// [info] [error] Could not run test spire.laws.LawTests:
// java.lang.ClassFormatError: Duplicate method name&signature in class file spire/std/OrderProductInstances$$anon$228
extra.run-tests: false
}

${vars.base} {
name: "Play2-core",
uri: "https://github.com/"${vars.playframework-ref},
extra: ${vars.base.extra} {
projects: ["Play"]
directory: "framework"
run-tests: false
// workaround for the problem with PlayVersion.scala file is being passed twice to Scala compiler
// and we get double definition error
commands += "set sources in (PlayProject, Compile, compile) := (sources in (PlayProject, Compile, compile)).value.distinct"
}
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "spray",
uri: "https://github.com/"${vars.spray-ref},
extra: ${vars.base.extra} {
// allows us to extract dependencies of spray with scalaVersion=2.10
extraction-version: "standard"
sbt-version: ${vars.sbt-version-override}
// disable running sphinx
exclude: docs
// they fail to compile
run-tests: false
}
}
]
}


//
// Projects that depend on shapeless 1.2.4
//
build += {
space: default.shapeless1
extraction-version: "2.11.0-RC1"
cross-version: disabled
projects: [

// anything here?

]
}