cross build scala 3.5.2 and 3.6.4 (#203)

Author: mpollmeier

.gitignore

@@ -1,4 +1,4 @@
-target/
+target
 
 /.bsp
 /gnupg-*

README.md

@@ -62,11 +62,10 @@ markdown-toc --maxdepth 3 README.md|tail -n +4
 - [Contribution guidelines](#contribution-guidelines)
   * [How can I build/stage a local version?](#how-can-i-buildstage-a-local-version)
   * [How can I get a new binary (bootstrapped) release?](#how-can-i-get-a-new-binary-bootstrapped-release)
-  * [Updating the Scala version](#updating-the-scala-version)
+  * [Adding support for a new Scala version](#adding-support-for-a-new-scala-version)
   * [Updating the shaded libraries](#updating-the-shaded-libraries)
 - [Fineprint](#fineprint)
 
-
 ## Benefits over / comparison with
 
 ### Regular Scala REPL
@@ -617,9 +616,8 @@ sbt stage
 ### How can I get a new binary (bootstrapped) release?
 While maven central jar releases are created for each commit on master (a new version tag is assigned automatically), the binary (bootstrapped) releases that end up in https://github.com/mpollmeier/scala-repl-pp/releases/latest are being triggered manually. Contributors can run the [bootstrap action](https://github.com/mpollmeier/scala-repl-pp/actions/workflows/bootstrap.yml).
 
-### Updating the Scala version
-* bump version in [build.sbt](build.sbt)
-* get relevant diff from dotty repo
+### Adding support for a new Scala version
+First, get relevant diff from dotty repo:
 ```bash
 cd /path/to/dotty
 git fetch
@@ -628,12 +626,12 @@ OLD=3.5.2-RC2 # set to version that was used before you bumped it
 NEW=3.6.4     # set to version that you bumped it to
 git diff $OLD..$NEW compiler/src/dotty/tools/repl
 ```
-* check if any of those changes need to be reapplied to this repo
+Check if any of those changes need to be reapplied to this repo - some files have been copied and slightly adjusted, the majority of functionality is reused. 
+If there's any binary incompatible changes (which is typically the case between minor versions), you need to add new projects for `core` and `server` in [build.sbt](build.sbt), add new `core/src/main/scala-3.x.y` directories etc.
 
 ### Updating the shaded libraries
 See [import-instructions.md](shaded-libs/import-instructions.md).
 
-
 ## Fineprint
 (*) To keep our codebase concise we do use libraries, most importantly the [com.lihaoyi](https://github.com/com-lihaoyi/) stack. We want to ensure that users can freely use their own dependencies without clashing with the srp classpath though, so we [copied them into our build](shaded-libs/src/main/scala/replpp/shaded) and [changed the namespace](shaded-libs/import-instructions) to `replpp.shaded`. Many thanks to the original authors, also for choosing permissive licenses. 
 

build.sbt

@@ -1,83 +1,91 @@
 name := "scala-repl-pp-root"
+ThisBuild/organization := "com.michaelpollmeier"
 publish/skip := true
 
-ThisBuild / organization := "com.michaelpollmeier"
-ThisBuild / scalaVersion := "3.6.4"
-lazy val ScalaTestVersion = "3.2.18"
+lazy val scalaVersions = Seq("3.5.2", "3.6.4")
+ThisBuild/scalaVersion := scalaVersions.max
 lazy val Slf4jVersion = "2.0.16"
 
-lazy val core = project.in(file("core"))
+lazy val core_364 = Build
+  .newProject("core", "3.6.4", "scala-repl-pp")
   .dependsOn(shadedLibs)
   .enablePlugins(JavaAppPackaging)
-  .settings(
-    name := "scala-repl-pp",
-    Compile/mainClass := Some("replpp.Main"),
-    executableScriptName := "srp",
-    libraryDependencies ++= Seq(
-      "org.scala-lang" %% "scala3-compiler" % scalaVersion.value,
-      "org.slf4j"       % "slf4j-simple"    % Slf4jVersion % Optional,
-    ),
-    commonSettings,
-  )
+  .settings(coreSettings)
 
-lazy val shadedLibs = project.in(file("shaded-libs"))
-  .settings(
-    name := "scala-repl-pp-shaded-libs",
-    Compile/compile/scalacOptions ++= Seq(
-      "-language:implicitConversions",
-      "-Wconf:any:silent", // silence warnings from shaded libraries
-      "-explain"
-    ),
-    Compile/doc/scalacOptions += "-nowarn",
-    commonSettings,
-  )
+lazy val core_352 = Build
+  .newProject("core", "3.5.2", "scala-repl-pp")
+  .dependsOn(shadedLibs)
+  .enablePlugins(JavaAppPackaging)
+  .settings(coreSettings)
+
+lazy val coreSettings = commonSettings ++ Seq(
+  Compile/mainClass := Some("replpp.Main"),
+  executableScriptName := "srp",
+  libraryDependencies ++= Seq(
+    "org.scala-lang" %% "scala3-compiler" % scalaVersion.value,
+    "org.slf4j"       % "slf4j-simple"    % Slf4jVersion % Optional,
+  ),
+)
+
+lazy val shadedLibs = project.in(file("shaded-libs")).settings(
+  name := "scala-repl-pp-shaded-libs",
+  scalaVersion := scalaVersions.min,
+  Compile/compile/scalacOptions ++= Seq(
+    "-language:implicitConversions",
+    "-Wconf:any:silent", // silence warnings from shaded libraries
+    "-explain"
+  ),
+  Compile/doc/scalacOptions += "-nowarn",
+  commonSettings,
+)
 
-lazy val server = project.in(file("server"))
-  .dependsOn(core)
+lazy val server_364 = Build
+  .newProject("server", "3.6.4", "scala-repl-pp-server")
+  .dependsOn(core_364)
   .enablePlugins(JavaAppPackaging)
-  .settings(
-    name := "scala-repl-pp-server",
-    executableScriptName := "srp-server",
-    Compile/mainClass := Some("replpp.server.Main"),
-    fork := true, // important: otherwise we run into classloader issues
-    libraryDependencies ++= Seq(
-      "com.lihaoyi"   %% "cask"         % "0.9.5",
-      "org.slf4j"      % "slf4j-simple" % Slf4jVersion % Optional,
-      "com.lihaoyi"   %% "requests"     % "0.8.2" % Test,
-    ),
-    commonSettings,
-  )
+  .settings(serverSettings)
+
+lazy val server_352 = Build
+  .newProject("server", "3.5.2", "scala-repl-pp-server")
+  .dependsOn(core_352)
+  .enablePlugins(JavaAppPackaging)
+  .settings(serverSettings)
+
+lazy val serverSettings = commonSettings ++ Seq(
+  Compile/mainClass := Some("replpp.server.Main"),
+  libraryDependencies ++= Seq(
+    "com.lihaoyi"   %% "cask"         % "0.9.5",
+    "org.slf4j"      % "slf4j-simple" % Slf4jVersion % Optional,
+    "com.lihaoyi"   %% "requests"     % "0.8.2" % Test,
+  ),
+  executableScriptName := "srp-server",
+  fork := true, // important: otherwise we run into classloader issues
+)
 
 lazy val integrationTests = project.in(file("integration-tests"))
-  .dependsOn(server)
+  .dependsOn(server_364)
   .settings(
     name := "integration-tests",
     fork := true, // important: otherwise we run into classloader issues
-    libraryDependencies ++= Seq(
-      "org.slf4j"      % "slf4j-simple" % Slf4jVersion % Optional,
-      "org.scalatest" %% "scalatest"    % ScalaTestVersion % Test,
-    ),
+    libraryDependencies += "org.slf4j" % "slf4j-simple" % Slf4jVersion % Optional,
     publish/skip := true
   )
 
-val commonSettings = Seq(
-  crossVersion := CrossVersion.full,
-  maintainer.withRank(KeyRanks.Invisible) := "[email protected]",
-)
+lazy val commonSettings = Seq(maintainer.withRank(KeyRanks.Invisible) := "[email protected]")
 
-ThisBuild / libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
+ThisBuild/libraryDependencies ++= Seq(
+  "org.scalatest" %% "scalatest" % "3.2.19" % Test,
   "com.lihaoyi"   %% "os-lib"    % "0.9.1" % Test,
 )
 
-ThisBuild / versionScheme := Some("strict")
+ThisBuild/versionScheme := Some("strict")
 
-ThisBuild / javacOptions ++= Seq(
+ThisBuild/javacOptions ++= Seq(
   "-g", //debug symbols
   "--release", "11"
 )
 
-ThisBuild / scalacOptions ++= Seq(
+ThisBuild/scalacOptions ++= Seq(
   "-release", "11",
   "-deprecation",
   "-feature",

core/src/main/scala-3.5.2/replpp/DottyRandomStuff.scala

@@ -0,0 +1,33 @@
+package replpp
+
+import dotty.tools.dotc.reporting.{HideNonSensicalMessages, StoreReporter, UniqueMessagePositions}
+import dotty.tools.repl.*
+
+/** random code that I needed to copy over from dotty to make things work, usually because it was `private[repl]`
+ */
+private[replpp] object DottyRandomStuff {
+
+  /** Create empty outer store reporter
+   * copied from https://github.com/lampepfl/dotty/blob/3.3.0-RC5/compiler/src/dotty/tools/repl/package.scala#L6  */
+  def newStoreReporter: StoreReporter = {
+    new StoreReporter(null) with UniqueMessagePositions with HideNonSensicalMessages
+  }
+
+  /** Based on https://github.com/scala/scala3/blob/3.5.2/compiler/src/dotty/tools/repl/ParseResult.scala#L130
+    * change: removed [private] classifier so we can access it...
+    * alternatively we could use reflection...
+    */
+  object ParseResult {
+    val commands: List[(String, String => ParseResult)] = List(
+      Quit.command -> (_ => Quit),
+      Quit.alias -> (_ => Quit),
+      Help.command -> (_ => Help),
+      Reset.command -> (arg => Reset(arg)),
+      Imports.command -> (_ => Imports),
+      Load.command -> (arg => Load(arg)),
+      TypeOf.command -> (arg => TypeOf(arg)),
+      DocOf.command -> (arg => DocOf(arg)),
+      Settings.command -> (arg => Settings(arg)),
+    )
+  }
+}