Skip to content

Commit 544ff54

Browse files
committed
Merge branch 'main' into report-all-warns-werror
2 parents dedd819 + 772be76 commit 544ff54

File tree

960 files changed

+48435
-5551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

960 files changed

+48435
-5551
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ jobs:
142142
run: |
143143
./project/scripts/sbt ";sjsSandbox/run ;sjsSandbox/test ;sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
144144
145+
- name: Test with Scala 2 library TASTy
146+
run: ./project/scripts/sbt ";set ThisBuild/Build.useScala2LibraryTasty := true ;scala3-bootstrapped/testCompilation i5; scala3-bootstrapped/testCompilation tests/run/typelevel-peano.scala" # only test a subset of test to avoid doubling the CI execution time
147+
145148
test_windows_fast:
146149
runs-on: [self-hosted, Windows]
147150
if: "(

.github/workflows/lts-backport.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
name: Add to backporting project
22

33
on:
4-
pull_request:
5-
types:
6-
- closed
4+
push:
5+
branches:
6+
- main
77

88
jobs:
99
add-to-backporting-project:
10-
if: "github.event.pull_request.merged == true
11-
&& github.event.pull_request.base.ref == 'main'
12-
&& !contains(github.event.pull_request.body, '[Next only]')"
10+
if: "!contains(github.event.push.head_commit.message, '[Next only]')"
1311
runs-on: ubuntu-latest
1412

1513
steps:
@@ -18,7 +16,7 @@ jobs:
1816
fetch-depth: 0
1917
- uses: coursier/cache-action@v6
2018
- uses: VirtusLab/[email protected]
21-
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.event.pull_request.number }}
19+
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
2220
env:
23-
GRAPHQL_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}
2422

Submodule munit updated 1 file

community-build/src/scala/dotty/communitybuild/projects.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def exec(projectDir: Path, binary: String, arguments: Seq[String], environment:
2525
import scala.jdk.CollectionConverters._
2626
val command = binary +: arguments
2727
log(command.mkString(" "))
28-
val builder = new ProcessBuilder(command: _*).directory(projectDir.toFile).inheritIO()
28+
val builder = new ProcessBuilder(command*).directory(projectDir.toFile).inheritIO()
2929
builder.environment.putAll(environment.asJava)
3030
val process = builder.start()
3131
val exitCode = process.waitFor()
@@ -362,7 +362,7 @@ object projects:
362362
project = "shapeless-3",
363363
sbtTestCommand = "testJVM; testJS",
364364
sbtDocCommand = forceDoc("typeable", "deriving"),
365-
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), // due to -Xfatal-warnings
365+
scalacOptions = "-source" :: "3.3" :: SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), // due to -Xfatal-warnings
366366
)
367367

368368
lazy val xmlInterpolator = SbtCommunityProject(
@@ -404,7 +404,7 @@ object projects:
404404
project = "zio",
405405
sbtTestCommand = "testJVMDotty",
406406
sbtDocCommand = forceDoc("coreJVM"),
407-
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"),
407+
scalacOptions = "-source" :: "3.3" :: SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"),
408408
dependencies =List(izumiReflect)
409409
)
410410

compiler/src/dotty/tools/MainGenericRunner.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ object MainGenericRunner {
195195

196196
case ExecuteMode.PossibleRun =>
197197
val newClasspath = (settings.classPath :+ ".").flatMap(_.split(classpathSeparator).filter(_.nonEmpty)).map(File(_).toURI.toURL)
198-
import dotty.tools.runner.RichClassLoader._
198+
import dotty.tools.runner.RichClassLoader.*
199199
val newClassLoader = ScalaClassLoader.fromURLsParallelCapable(newClasspath)
200200
val targetToRun = settings.possibleEntryPaths.to(LazyList).find { entryPath =>
201201
newClassLoader.tryToLoadClass(entryPath).orElse {

compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ package jvm
44

55
import scala.language.unsafeNulls
66

7-
import dotty.tools.dotc.core.Flags._
8-
import dotty.tools.dotc.core.Symbols._
7+
import dotty.tools.dotc.core.Flags.*
8+
import dotty.tools.dotc.core.Symbols.*
99
import dotty.tools.dotc.report
1010

1111
/**

0 commit comments

Comments
 (0)