Skip to content

2.13: new Scala SHA #1677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 4, 2023
Merged

2.13: new Scala SHA #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
127b4a5
2.13: new Scala SHA
SethTisue Jun 22, 2023
fcc2b86
wip
SethTisue Jun 30, 2023
d4a991e
wip
SethTisue Jun 30, 2023
d780034
wip
SethTisue Jun 30, 2023
1b0b740
wip
SethTisue Jul 3, 2023
65f7042
wip
SethTisue Jul 3, 2023
deb3c68
Merge remote-tracking branch 'origin/2.13.x' into new-scala-2.13-sha-…
SethTisue Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nightly.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# June 3, 2023
nightly=2.13.12-bin-1a2373b
# July 3, 2023
nightly=2.13.12-bin-7c63166
12 changes: 6 additions & 6 deletions proj/scapegoat.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// https://github.com/scalacommunitybuild/scapegoat.git#community-build-2.13 # was sksamuel, master
// https://github.com/scalacommunitybuild/scapegoat.git#community-build-2.13 # was scapegoat-scala, master

// forked (August 2019; refreshed July 2020) because some
// forked (August 2019; refreshed June 2023) because some
// classpath-handling code didn't work under dbuild

vars.proj.scapegoat: ${vars.base} {
name: "scapegoat"
uri: "https://github.com/scalacommunitybuild/scapegoat.git#883d336dab2c93b34e887fa5a4b43fc8a5636f9f"
uri: "https://github.com/scalacommunitybuild/scapegoat.git#ecd064439af8f3ca447d6656c513eded477031c9"

// because of https://github.com/scala/scala/pull/9208, is my guess --
// we should be able to re-enable after upstream moves to 2.13.4
extra.commands: ${vars.default-commands} [
"""set Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ComparisonToEmptyListTest.scala""""
// test started failing on 2.13.12; see my remarks at
// https://github.com/scala/community-build/pull/1677#issuecomment-1614721682
"""set Test / unmanagedSources / excludeFilter := HiddenFileFilter || "UnnecessaryConversionTest.scala""""
]
}