From 9f454ae13f3fb74584d92217e999c283894d0e2d Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 2 Nov 2016 09:50:24 -0400 Subject: [PATCH] work around issue 384 by freezing shapeless and macro-compat for the time being --- community.dbuild | 4 ++++ project-refs.conf | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/community.dbuild b/community.dbuild index 31c439c28..8827126b2 100644 --- a/community.dbuild +++ b/community.dbuild @@ -182,6 +182,8 @@ build += { extra.run-tests: false } + // temporarily frozen at a commit just before 546f0453 with introduced the + // use of CrossVersion.patch; see https://github.com/scala/community-builds/issues/384 ${vars.base} { name: "shapeless" uri: ${vars.uris.shapeless-uri} @@ -378,6 +380,8 @@ build += { // TODO use 2.12.x branch once needed changes are merged there? } + // temporarily frozen at a commit just before 546f0453 with introduced the + // use of CrossVersion.patch; see https://github.com/scala/community-builds/issues/384 ${vars.base} { name: "macro-compat" uri: ${vars.uris.macro-compat-uri} diff --git a/project-refs.conf b/project-refs.conf index 15ff3b3cb..aa9216347 100644 --- a/project-refs.conf +++ b/project-refs.conf @@ -20,7 +20,7 @@ vars.uris: { kxbmap-configs-uri: "https://github.com/kxbmap/configs.git" lift-json-uri: "https://github.com/SethTisue/framework.git#community-build-2.12" machinist-uri: "https://github.com/typelevel/machinist.git" - macro-compat-uri: "https://github.com/milessabin/macro-compat.git" + macro-compat-uri: "https://github.com/milessabin/macro-compat.git#2a857e42f48620c34900e421579404d290286a75" macro-paradise-uri: "https://github.com/scalamacros/paradise.git#2.12.0" mima-uri: "https://github.com/typesafehub/migration-manager.git#scala-2.12" monocle-uri: "https://github.com/julien-truffaut/Monocle.git" @@ -55,7 +55,7 @@ vars.uris: { scodec-uri: "https://github.com/scodec/scodec.git#series/1.10.x" scopt-uri: "https://github.com/scopt/scopt.git#scopt3" scoverage-uri: "https://github.com/scoverage/scalac-scoverage-plugin.git" - shapeless-uri: "https://github.com/milessabin/shapeless.git" + shapeless-uri: "https://github.com/milessabin/shapeless.git#eec3d55d1840a2ab31efedc9f8badefd6a49f5f9" simulacrum-uri: "https://github.com/mpilquist/simulacrum.git#2a75226fe59055f72fb5fb2f556edba62e37f6d4" slick-uri: "https://github.com/slick/slick.git" sourcecode-uri: "https://github.com/lihaoyi/sourcecode.git"