From 81228f6b548060f8932ced53b30b2da765f7faa4 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 28 Apr 2017 07:41:01 -0700 Subject: [PATCH 1/5] upgrade to sbt 0.13.16-RC1 --- configs/community.dbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index 174e2d213..69133bfe6 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -30,7 +30,7 @@ include file(".dbuild/resolvers.conf") vars { default-commands: [] - sbt-version: "0.13.15" + sbt-version: "0.13.16-RC1" } //// compiler options manipulation From 9451d2f3cc27dce067561d94be7d107a609cb58f Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 24 Jul 2017 13:34:36 -0700 Subject: [PATCH 2/5] build mima master branch now that 2.12 support was merged note that this requires being on sbt 0.13.16 --- configs/community.dbuild | 6 ------ configs/project-refs.conf | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index 69133bfe6..1f20356d6 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -538,15 +538,9 @@ build += { extra.options: ["-DSKIP_FLAKY=true"] } - // note that we don't have MiMa in the JDK6 build. I tried but it - // was running out of PermGen when running the functional tests. - // rather than sink time into investigating, just confining it to - // JDK8 world seems perfectly fine. ${vars.base} { name: "mima" uri: ${vars.uris.mima-uri} - // normally MiMa runs on 2.10 (because sbt 0.13 does), so the branch won't - // be merged onto master for quite a while yet // we don't compile sbt plugins extra.exclude: ["sbtplugin"] } diff --git a/configs/project-refs.conf b/configs/project-refs.conf index df2068adb..409d9ca59 100644 --- a/configs/project-refs.conf +++ b/configs/project-refs.conf @@ -44,7 +44,7 @@ vars.uris: { machinist-uri: "https://github.com/typelevel/machinist.git" macro-compat-uri: "https://github.com/milessabin/macro-compat.git" macro-paradise-uri: "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12" - mima-uri: "https://github.com/typesafehub/migration-manager.git#scala-2.12" + mima-uri: "https://github.com/typesafehub/migration-manager.git" minitest-uri: "https://github.com/monix/minitest.git" monix-uri: "https://github.com/monix/monix.git#series/2.x" monocle-uri: "https://github.com/julien-truffaut/Monocle.git" From b9102f33215f24d39663263c38dd9b081ba4a71d Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 24 Jul 2017 14:14:00 -0700 Subject: [PATCH 3/5] typesafe-emoji is now lightbend-emoji long live the new flesh --- configs/community.dbuild | 8 ++++---- configs/project-refs.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index 1f20356d6..fd37b30d4 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1105,11 +1105,11 @@ build += { uri: ${vars.uris.scalaj-http-uri} } - // forked (April 2017) to get rid of the usual bintray-sbt stuff that - // makes dbuild upset + // forked (April 2017; updated July 2017) to get rid of the usual bintray-sbt stuff + // that makes dbuild upset ${vars.base} { - name: "typesafe-emoji" - uri: ${vars.uris.typesafe-emoji-uri} + name: "lightbend-emoji" + uri: ${vars.uris.lightbend-emoji-uri} } // others are not depending on this yet ("not ready for general diff --git a/configs/project-refs.conf b/configs/project-refs.conf index 409d9ca59..8bff3fe02 100644 --- a/configs/project-refs.conf +++ b/configs/project-refs.conf @@ -40,6 +40,7 @@ vars.uris: { kind-projector-uri: "https://github.com/non/kind-projector.git" kxbmap-configs-uri: "https://github.com/kxbmap/configs.git" lift-json-uri: "https://github.com/lift/framework.git" + lightbend-emoji-uri: "https://github.com/scalacommunitybuild/lightbend-emoji.git#community-build-2.12" log4s-uri: "https://github.com/Log4s/log4s.git" machinist-uri: "https://github.com/typelevel/machinist.git" macro-compat-uri: "https://github.com/milessabin/macro-compat.git" @@ -107,7 +108,6 @@ vars.uris: { twirl-uri: "https://github.com/playframework/twirl.git" twitter-util-uri: "https://github.com/twitter/util.git#develop" twotails-uri: "https://github.com/wheaties/TwoTails.git" - typesafe-emoji-uri: "https://github.com/scalacommunitybuild/typesafe-emoji.git#community-build-2.12" unfiltered-uri: "https://github.com/unfiltered/unfiltered.git#0.9.0" upickle-uri: "https://github.com/scalacommunitybuild/upickle-pprint.git#community-build-2.12" utest-uri: "https://github.com/scalacommunitybuild/utest.git#community-build-2.12" From 3922d2a92edc6a8bfe18531ad119791c447ec818 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 24 Jul 2017 14:27:23 -0700 Subject: [PATCH 4/5] reinstate conductr-lib --- configs/community.dbuild | 16 ++++++++++++++++ configs/project-refs.conf | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index fd37b30d4..7d2ab8bb6 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -861,6 +861,22 @@ build += { extra.projects: ["coreJVM", "tckTests"] // no Scala.js, no benchmarks } + ${vars.base} { + name: "conductr-lib" + uri: ${vars.uris.conductr-lib-uri} + extra.exclude: [ + // we don't have Lagom yet + "lagom13JavaConductRBundleLib", "lagom13ScalaConductRBundleLib" + // didn't compile (July 2017) + "akka24ConductRClientLib" + // not our Akka version + "akka25Common", "akka25ConductRBundleLib", "akka25ConductRClientLib", "akka25TestLib" + // Play stuff didn't work, maybe try again later? + "play25ConductRBundleLib", "play25ConductRClientLib", "play25Common" + "play26ConductRBundleLib", "play26ConductRClientLib", "play26Common" + ] + } + // 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 diff --git a/configs/project-refs.conf b/configs/project-refs.conf index 8bff3fe02..7d8db12ca 100644 --- a/configs/project-refs.conf +++ b/configs/project-refs.conf @@ -21,7 +21,7 @@ vars.uris: { catalysts-uri: "https://github.com/typelevel/catalysts.git" cats-uri: "https://github.com/typelevel/cats.git#669a0235" # was master cats-effect-uri: "https://github.com/typelevel/cats-effect.git#2e0e05c" # was master - + conductr-lib-uri: "https://github.com/typesafehub/conductr-lib.git" discipline-uri: "https://github.com/typelevel/discipline.git#v0.7" dispatch-uri: "https://github.com/dispatch/reboot.git#0.12.x" doodle-uri: "https://github.com/scalacommunitybuild/doodle.git#community-build-2.12" From 490a2a1127ee22d3122a734216cba37fb9c3d418 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 24 Jul 2017 15:44:45 -0700 Subject: [PATCH 5/5] add scalastyle --- configs/community.dbuild | 7 +++++++ configs/project-refs.conf | 1 + 2 files changed, 8 insertions(+) diff --git a/configs/community.dbuild b/configs/community.dbuild index 7d2ab8bb6..31143cb6e 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1204,4 +1204,11 @@ build += { extra.test-tasks: ["compile"] } + // forked (July 2017) to get rid of the usual bintray-sbt stuff that + // makes dbuild upset + ${vars.base} { + name: "scalastyle" + uri: ${vars.uris.scalastyle-uri} + } + ]} diff --git a/configs/project-refs.conf b/configs/project-refs.conf index 7d8db12ca..0697cf63b 100644 --- a/configs/project-refs.conf +++ b/configs/project-refs.conf @@ -86,6 +86,7 @@ vars.uris: { scalapb-uri: "https://github.com/scalapb/ScalaPB.git#268318c" # was master scalaprops-uri: "https://github.com/scalaprops/scalaprops.git" scalariform-uri: "https://github.com/scala-ide/scalariform.git" + scalastyle-uri: "https://github.com/scalacommunitybuild/scalastyle.git#community-build-2.12" scalatags-uri: "https://github.com/lihaoyi/scalatags.git" scalatest-uri: "https://github.com/scalatest/scalatest.git#3.0.x" scalatex-uri: "https://github.com/lihaoyi/scalatex.git"