Skip to content

add conductr-lib #432

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

Merged
merged 11 commits into from
Dec 10, 2016
Merged

add conductr-lib #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a011d84
add conductr-lib
SethTisue Dec 8, 2016
4f04035
add akka-sse (a dependency of conductr-lib)
SethTisue Dec 9, 2016
9ac551e
oops
SethTisue Dec 9, 2016
e0d2589
akka-sse: disable scalafmt
SethTisue Dec 9, 2016
e525beb
fork akka-sse (because bintray-sbt)
SethTisue Dec 9, 2016
d9d7da7
use scalacommunitybuild org
SethTisue Dec 9, 2016
a50e74b
add akka-contrib-extra (dependency of conductr-lib)
SethTisue Dec 9, 2016
5a1e111
fork akka-contrib-extra, because bintray-sbt as usual
SethTisue Dec 9, 2016
161e8f1
conductor-lib: remove a subproject Christopher says we don't need
SethTisue Dec 10, 2016
4217ef8
conductr-lib: don't try to build Play stuff
SethTisue Dec 10, 2016
edb3629
update comments
SethTisue Dec 10, 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
51 changes: 51 additions & 0 deletions community.dbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,4 +788,55 @@ build += {
extra.exclude: ["catsJVM"]
}

${vars.base} {
name: "conductr-lib"
uri: ${vars.uris.conductr-lib-uri}
extra.exclude: [
// not our Akka version
"akka23Common", "akka23ConductRBundleLib", "akka23TestLib"
// we don't have Lagom yet
"lagom1ConductRBundleLib"
// not our Play version
"play23Common", "play23ConductRBundleLib", "play23ConductRClientLib"
// also not our Play version
"play24Common", "play24ConductRBundleLib", "play24ConductRClientLib"
// "That particular lib shouldn't be processed", says Christopher
"akka24ConductRClientLib"
// Play stuff didn't work, maybe try again later?
"play25ConductRBundleLib", "play25ConductRClientLib", "play25Common"
]
}

// this was added because conductr-lib's Play integration depended on it,
// but we ended up not including that integration (for now anyway?), so
// nothing depends on this. leaving it in since we might as well, but
// if it acts up, it can go.
// forked (December 2016) to get rid of the usual bintray-sbt stuff that
// makes dbuild upset
${vars.base} {
name: "akka-sse"
uri: ${vars.uris.akka-sse-uri}
extra.exclude: ["akka-sse-jmh"] // no benchmarking stuff plz
// disable scalafmt
extra.commands: ["set every scalafmt := {}"]
// but why does scalafmt turn up in libraryDependencies at all?
// see https://github.com/olafurpg/scalafmt/issues/485#issuecomment-253601375
check-missing: false
deps.ignore: [
"com.geirsson#scalafmt-cli"
"com.geirsson#scalafmt"
]
}

// this was added because conductr-lib's Play integration depended on it,
// but we ended up not including that integration (for now anyway?), so
// nothing depends on this. leaving it in since we might as well, but
// if it acts up, it can go.
// forked (December 2016) to get rid of the usual bintray-sbt stuff that
// makes dbuild upset
Copy link

Choose a reason for hiding this comment

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

@SethTisue Please check: lightbend-labs/dbuild@7ef6be7
Bintray-sbt based projects should be ok with 0.9.7-RC1. In theory, at least.

Copy link
Member Author

Choose a reason for hiding this comment

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

@cunei not in my experience — see lightbend-labs/dbuild#158, which I would suggest reopening as the problem doesn't seem to be solved. (I don't have the necessary access to reopen it myself.)

${vars.base} {
name: "akka-contrib-extra"
uri: ${vars.uris.akka-contrib-extra-uri}
}

]}
3 changes: 3 additions & 0 deletions project-refs.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
vars.uris: {
acyclic-uri: "https://github.com/lihaoyi/acyclic.git"
akka-contrib-extra-uri: "https://github.com/scalacommunitybuild/akka-contrib-extra.git#community-build-2.12"
akka-http-uri: "https://github.com/scalacommunitybuild/akka-http.git#community-build-2.12"
akka-more-uri: "https://github.com/akka/akka.git#release-2.4"
akka-sse-uri: "https://github.com/scalacommunitybuild/akka-sse.git#community-build-2.12"
akka-uri: "https://github.com/akka/akka.git#release-2.4"
argonaut-uri: "https://github.com/argonaut-io/argonaut.git#a84800df9b8e919de741bbae46869d9e6dc783b4"
async-uri: "https://github.com/scala/async.git"
// breeze-uri: "https://github.com/scalanlp/breeze.git"
catalysts-uri: "https://github.com/typelevel/catalysts.git"
cats-uri: "https://github.com/typelevel/cats.git"
conductr-lib-uri: "https://github.com/typesafehub/conductr-lib.git"
discipline-uri: "https://github.com/typelevel/discipline.git#v0.7"
fastparse-uri: "https://github.com/scalacommunitybuild/fastparse.git#no-coursier"
fs2-uri: "https://github.com/functional-streams-for-scala/fs2.git#series/0.9"
Expand Down