Thanks to visit codestin.com
Credit goes to github.com

Skip to content

merge 2.12 to 2.13 20230405 [ci: last-only] #10367

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 22 commits into from
Apr 8, 2023
Merged

merge 2.12 to 2.13 20230405 [ci: last-only] #10367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
92e0c36
Lint for integral divisions that are widened to a float
lrytz Feb 14, 2023
e6a3a68
Merge pull request #10313 from lrytz/div-to-float
SethTisue Mar 8, 2023
4fd2a2e
new reference compiler is 2.12.18-M1, for JDK 20
SethTisue Mar 6, 2023
1357841
get tests passing on JDK 20
SethTisue Mar 6, 2023
2530369
add JDK 20 (early access) to daily CI matrix
SethTisue Feb 10, 2023
28c0d12
Merge pull request #10306 from SethTisue/test-jdk20-on-ci
SethTisue Mar 9, 2023
45dad1e
update .gitignore
SethTisue Mar 10, 2023
30158dd
fix (?) REPL test that intermittently fails on Windows
SethTisue Mar 10, 2023
4b1dc0b
Merge pull request #10338 from SethTisue/sd-831
SethTisue Mar 10, 2023
ef6db2b
Update sbt-buildinfo to 0.11.0 in 2.12.x
scala-steward Mar 10, 2023
a85e003
Merge pull request #10341 from scala-steward/update/2.12.x/sbt-buildi…
SethTisue Mar 13, 2023
e28268d
Update jquery to 3.6.4 in 2.12.x
scala-steward Mar 26, 2023
c2bab31
Merge pull request #10354 from scala-steward/update/2.12.x/jquery-3.6.4
SethTisue Mar 27, 2023
67fc770
Upgrade to asm 9.5, for JDK21 support
SethTisue Apr 4, 2023
2d9e951
Merge pull request #10362 from SethTisue/asm-9.4-on-2.12
SethTisue Apr 4, 2023
8d5e4b8
GitHub Actions config: JDK 20 is GA
SethTisue Apr 5, 2023
59b872e
Merge pull request #10366 from SethTisue/jdk-20-now-ga
SethTisue Apr 5, 2023
bdeed44
Merge commit '4b1dc0b60a' into merge-2.12-to-2.13-20230405
SethTisue Apr 5, 2023
b64f08e
Merge commit 'a85e003232' into merge-2.12-to-2.13-20230405
SethTisue Apr 5, 2023
edc430c
Merge commit 'c2bab31f1e' into merge-2.12-to-2.13-20230405
SethTisue Apr 5, 2023
6904257
Merge commit '2d9e951238' into merge-2.12-to-2.13-20230405
SethTisue Apr 5, 2023
13c9edc
Merge commit '59b872eaf2' into merge-2.12-to-2.13-20230405
SethTisue Apr 5, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
java: [8, 11, 17, 20-ea]
java: [8, 11, 17, 20]
runs-on: ${{matrix.os}}
steps:
- run: git config --global core.autocrlf false
Expand Down
2 changes: 1 addition & 1 deletion project/ScaladocSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ object ScaladocSettings {

// when this changes, the integrity check in HtmlFactory.scala also needs updating
val webjarResources = Seq(
"org.webjars" % "jquery" % "3.6.3"
"org.webjars" % "jquery" % "3.6.4"
)

def extractResourcesFromWebjar = Def.task {
Expand Down
2 changes: 1 addition & 1 deletion project/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
2 changes: 1 addition & 1 deletion src/scaladoc/scala/tools/nsc/doc/html/HtmlFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class HtmlFactory(val universe: doc.Universe, val reporter: Reporter) {
)

final def webjarResources = List(
("jquery.min.js", "pvPw+upLPUjgMXY0G+8O0xUf+/Im1MZjXxxgOcBQBXU=")
("jquery.min.js", "oP6HI9z1XaZNBrJURtCoUT5SUnxFr8s3BzRl+cbzUq8=")
)

/** Generates the Scaladoc site for a model into the site root.
Expand Down