Skip to content

Backport "Add sources of synthetic classes to sources jar" to 3.5.1 #21181

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.

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 2 commits into from
Jul 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions library-aux/src/scala/AnyKind.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package scala

/** The super-type of all types.
*
* See [[https://docs.scala-lang.org/scala3/reference/other-new-features/kind-polymorphism.html]].
*/
final abstract class AnyKind
7 changes: 7 additions & 0 deletions library-aux/src/scala/Matchable.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package scala

/** The base trait of types that can be safely pattern matched against.
*
* See [[https://docs.scala-lang.org/scala3/reference/other-new-features/matchable.html]].
*/
trait Matchable
7 changes: 7 additions & 0 deletions library-aux/src/scala/andType.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package scala

/** The intersection of two types.
*
* See [[https://docs.scala-lang.org/scala3/reference/new-types/intersection-types.html]].
*/
type &[A, B]
7 changes: 7 additions & 0 deletions library-aux/src/scala/orType.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package scala

/** The union of two types.
*
* See [[https://docs.scala-lang.org/scala3/reference/new-types/union-types.html]].
*/
type |[A, B]
6 changes: 5 additions & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,11 @@ object Build {
"-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator),
"-Yexplicit-nulls",
),
(Compile / doc / scalacOptions) ++= ScaladocConfigs.DefaultGenerationSettings.value.settings
(Compile / doc / scalacOptions) ++= ScaladocConfigs.DefaultGenerationSettings.value.settings,
(Compile / packageSrc / mappings) ++= {
val auxBase = (ThisBuild / baseDirectory).value / "library-aux/src"
auxBase ** "*.scala" pair io.Path.relativeTo(auxBase)
},
)

lazy val `scala3-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)
Expand Down
Loading