Skip to content

Commit 1c65c89

Browse files
authored
Merge pull request #412 from SethTisue/unfreeze-shapeless
unfreeze Shapeless
2 parents 7c0c3b2 + bf1025a commit 1c65c89

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

community.dbuild

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ build += {
168168
extra.run-tests: false
169169
}
170170

171-
// temporarily frozen at a commit just before 546f0453 with introduced the
172-
// use of CrossVersion.patch; see https://github.com/scala/community-builds/issues/384
173171
${vars.base} {
174172
name: "shapeless"
175173
uri: ${vars.uris.shapeless-uri}
@@ -357,8 +355,6 @@ build += {
357355
// TODO use 2.12.x branch once needed changes are merged there?
358356
}
359357

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

project-refs.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ vars.uris: {
1919
kxbmap-configs-uri: "https://github.com/kxbmap/configs.git"
2020
lift-json-uri: "https://github.com/lift/framework.git"
2121
machinist-uri: "https://github.com/typelevel/machinist.git"
22-
macro-compat-uri: "https://github.com/milessabin/macro-compat.git#2a857e42f48620c34900e421579404d290286a75"
22+
macro-compat-uri: "https://github.com/milessabin/macro-compat.git"
2323
macro-paradise-uri: "https://github.com/scalamacros/paradise.git#2.12.1"
2424
mima-uri: "https://github.com/typesafehub/migration-manager.git#scala-2.12"
2525
monocle-uri: "https://github.com/julien-truffaut/Monocle.git"
@@ -56,7 +56,7 @@ vars.uris: {
5656
scodec-uri: "https://github.com/scodec/scodec.git#series/1.10.x"
5757
scopt-uri: "https://github.com/scopt/scopt.git#scopt3"
5858
scoverage-uri: "https://github.com/scoverage/scalac-scoverage-plugin.git"
59-
shapeless-uri: "https://github.com/milessabin/shapeless.git#eec3d55d1840a2ab31efedc9f8badefd6a49f5f9"
59+
shapeless-uri: "https://github.com/milessabin/shapeless.git"
6060
simulacrum-uri: "https://github.com/mpilquist/simulacrum.git#2a75226fe59055f72fb5fb2f556edba62e37f6d4"
6161
slick-uri: "https://github.com/slick/slick.git"
6262
sourcecode-uri: "https://github.com/lihaoyi/sourcecode.git"

0 commit comments

Comments
 (0)