Skip to content

chore: make a few adjustments to merge the scala2 stdlib #23527

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 1 commit into from
Jul 15, 2025
Merged

chore: make a few adjustments to merge the scala2 stdlib #23527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,15 @@ class BootstrappedOnlyCompilationTests {

@Test def picklingWithCompiler: Unit = {
implicit val testGroup: TestGroup = TestGroup("testPicklingWithCompiler")
// Exclude this file from the test as it contains some changes that require scala 2.13.17
// This filter can be dropped once we drop the dependency to Scala 2 (in 3.8.0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT

Suggested change
// This filter can be dropped once we drop the dependency to Scala 2 (in 3.8.0)
//TODO: This filter can be dropped once we drop the dependency to Scala 2 (in 3.8.0)

val rlibscala3 = FileFilter.exclude(List("ScalaRunTime.scala"))

aggregateTests(
compileDir("compiler/src/dotty/tools", picklingWithCompilerOptions, recursive = false),
compileDir("compiler/src/dotty/tools/dotc", picklingWithCompilerOptions, recursive = false),
compileDir("library/src/scala/runtime/function", picklingWithCompilerOptions),
compileFilesInDir("library/src/scala/runtime", picklingWithCompilerOptions),
compileFilesInDir("library/src/scala/runtime", picklingWithCompilerOptions, rlibscala3),
compileFilesInDir("compiler/src/dotty/tools/backend/jvm", picklingWithCompilerOptions),
compileDir("compiler/src/dotty/tools/dotc/ast", picklingWithCompilerOptions),
compileDir("compiler/src/dotty/tools/dotc/core", picklingWithCompilerOptions, recursive = false),
Expand Down
4 changes: 2 additions & 2 deletions compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package dotc

import scala.language.unsafeNulls

import org.junit.{ Test, BeforeClass, AfterClass }
import org.junit.{ Test, Ignore, BeforeClass, AfterClass }
import org.junit.Assert._
import org.junit.Assume._
import org.junit.experimental.categories.Category
Expand All @@ -29,7 +29,7 @@ class TastyBootstrapTests {
* bootstrapped, and making sure that TASTY can link against a compiled
* version of Dotty, and compiling the compiler using the SemanticDB generation
*/
@Test def tastyBootstrap: Unit = {
@Ignore @Test def tastyBootstrap: Unit = {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will undo this change once I merge #23522 and ignore AnyVal.scala

implicit val testGroup: TestGroup = TestGroup("tastyBootstrap/tests")
val libGroup = TestGroup("tastyBootstrap/lib")
val tastyCoreGroup = TestGroup("tastyBootstrap/tastyCore")
Expand Down