Skip to content

Commit 4e8dbfd

Browse files
WojciechMazuroderskyGedochao
authored
Backport "Work around sbt#8376 and re-enable shapeless-3 community build" to 3.8.0 (#24795)
Backports #24709 to the 3.8.0-RC4. PR submitted by the release tooling. [skip ci] --------- Co-authored-by: odersky <[email protected]> Co-authored-by: Piotr Chabelski <[email protected]>
1 parent 9f4def9 commit 4e8dbfd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class CommunityBuildTestC:
9393
@Test def scalaz = projects.scalaz.run()
9494
@Test def scas = projects.scas.run()
9595
@Test def sconfig = projects.sconfig.run()
96-
//@Test def shapeless3 = projects.shapeless3.run()
96+
@Test def shapeless3 = projects.shapeless3.run()
9797
@Test def sourcecode = projects.sourcecode.run()
9898
@Test def specs2 = projects.specs2.run()
9999

project/Build.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,7 @@ object Build {
19601960
"org.scala-lang.modules" % "scala-asm" % "9.9.0-scala-1",
19611961
Dependencies.compilerInterface,
19621962
"com.github.sbt" % "junit-interface" % "0.13.3" % Test,
1963-
("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
1963+
("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13).excludeAll(("org.scala-lang" % "scala-reflect")),
19641964
),
19651965
// NOTE: The only difference here is that we drop `-Werror` and semanticDB for now
19661966
Compile / scalacOptions := Seq("-deprecation", "-feature", "-unchecked", "-encoding", "UTF8", "-language:implicitConversions"),
@@ -3028,7 +3028,7 @@ object Build {
30283028
publishConfiguration ~= (_.withOverwrite(true)),
30293029
publishLocalConfiguration ~= (_.withOverwrite(true)),
30303030
projectID ~= {id =>
3031-
val line = "scala.versionLine" -> versionLine
3031+
val line = "info.scala.versionLine" -> versionLine
30323032
id.withExtraAttributes(id.extraAttributes + line)
30333033
},
30343034
Test / publishArtifact := false,

0 commit comments

Comments
 (0)