Skip to content

Commit 62988c5

Browse files
authored
Merge pull request #385 from SethTisue/work-around-issue-384
work around issue 384
2 parents 3509046 + 9f454ae commit 62988c5

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

community.dbuild

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ build += {
182182
extra.run-tests: false
183183
}
184184

185+
// temporarily frozen at a commit just before 546f0453 with introduced the
186+
// use of CrossVersion.patch; see https://github.com/scala/community-builds/issues/384
185187
${vars.base} {
186188
name: "shapeless"
187189
uri: ${vars.uris.shapeless-uri}
@@ -378,6 +380,8 @@ build += {
378380
// TODO use 2.12.x branch once needed changes are merged there?
379381
}
380382

383+
// temporarily frozen at a commit just before 546f0453 with introduced the
384+
// use of CrossVersion.patch; see https://github.com/scala/community-builds/issues/384
381385
${vars.base} {
382386
name: "macro-compat"
383387
uri: ${vars.uris.macro-compat-uri}

project-refs.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ vars.uris: {
2020
kxbmap-configs-uri: "https://github.com/kxbmap/configs.git"
2121
lift-json-uri: "https://github.com/SethTisue/framework.git#community-build-2.12"
2222
machinist-uri: "https://github.com/typelevel/machinist.git"
23-
macro-compat-uri: "https://github.com/milessabin/macro-compat.git"
23+
macro-compat-uri: "https://github.com/milessabin/macro-compat.git#2a857e42f48620c34900e421579404d290286a75"
2424
macro-paradise-uri: "https://github.com/scalamacros/paradise.git#2.12.0"
2525
mima-uri: "https://github.com/typesafehub/migration-manager.git#scala-2.12"
2626
monocle-uri: "https://github.com/julien-truffaut/Monocle.git"
@@ -55,7 +55,7 @@ vars.uris: {
5555
scodec-uri: "https://github.com/scodec/scodec.git#series/1.10.x"
5656
scopt-uri: "https://github.com/scopt/scopt.git#scopt3"
5757
scoverage-uri: "https://github.com/scoverage/scalac-scoverage-plugin.git"
58-
shapeless-uri: "https://github.com/milessabin/shapeless.git"
58+
shapeless-uri: "https://github.com/milessabin/shapeless.git#eec3d55d1840a2ab31efedc9f8badefd6a49f5f9"
5959
simulacrum-uri: "https://github.com/mpilquist/simulacrum.git#2a75226fe59055f72fb5fb2f556edba62e37f6d4"
6060
slick-uri: "https://github.com/slick/slick.git"
6161
sourcecode-uri: "https://github.com/lihaoyi/sourcecode.git"

0 commit comments

Comments
 (0)