Merge pull request #15794 from dwijnand/bp/bridgeChanges

dwijnand · web-flow · commit d6bea06ff521 · 2022-08-03T20:54:51.000+01:00
diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats
@@ -1 +1 @@
-Subproject commit 704c7fd5d2079854637885514fccb62165e267f7
+Subproject commit 771c6c802f59c72dbc1be1898081c9c882ddfeb0
diff --git a/community-build/community-projects/discipline b/community-build/community-projects/discipline
@@ -1 +1 @@
-Subproject commit afd00132678985341db210b56f3b2ead1a8405c2
+Subproject commit 09c975b18dc0b4e10499fb2922abac82ea8b5252
diff --git a/community-build/community-projects/discipline-munit b/community-build/community-projects/discipline-munit
@@ -1 +1 @@
-Subproject commit 38ea89226b8ddedc891b160f75d57ae5177f19a1
+Subproject commit 4e61f186195660529e7a6f7461b939477735e3f4
diff --git a/community-build/community-projects/fs2 b/community-build/community-projects/fs2
@@ -1 +1 @@
-Subproject commit 457c025ef506457fc8a7a8ba3abbf8b607decd4a
+Subproject commit ac5275baf33b03da0a461b5de735ee6a1f5a524e
diff --git a/community-build/community-projects/http4s b/community-build/community-projects/http4s
@@ -1 +1 @@
-Subproject commit fc0a18dd0a8091f0b2cdc87b58953e76efa47426
+Subproject commit c3d46f561ed1026ae54e1acbd5e4730f0498ea93
diff --git a/community-build/community-projects/munit-cats-effect b/community-build/community-projects/munit-cats-effect
@@ -1 +1 @@
-Subproject commit 248187bec8dc540e06950b7faf8d0e0be1ad31b1
+Subproject commit 40e44282766919a105e9dbbccbc3d14b79fee335
diff --git a/community-build/community-projects/scala-java8-compat b/community-build/community-projects/scala-java8-compat
@@ -1 +1 @@
-Subproject commit 57e1f7ccaa67dcac2b4227ab1a6ee0fcb5f42023
+Subproject commit eb16484fe8410643e157696421eeb79910ba36d5
diff --git a/community-build/community-projects/scalacheck b/community-build/community-projects/scalacheck
@@ -1 +1 @@
-Subproject commit 976db31cd549328167a90ecc6f5f31efa83cd845
+Subproject commit 0ac8005753ab98b6494fd631502201b97a103638
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -140,7 +140,7 @@ final case class SbtCommunityProject(
       case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
       case _ => Nil
     extraSbtArgs ++ sbtProps ++ List(
-      "-sbt-version", "1.6.2",
+      "-sbt-version", "1.7.1",
       "-Dsbt.supershell=false",
       s"-Ddotty.communitybuild.dir=$communitybuildDir",
       s"--addPluginSbtFile=$sbtPluginFilePath"
@@ -265,9 +265,8 @@ object projects:
 
   lazy val scalacheck = SbtCommunityProject(
     project       = "scalacheck",
-    sbtTestCommand   = "jvm/test;js/test",
-    sbtPublishCommand = "jvm/publishLocal;js/publishLocal",
-    sbtDocCommand = forceDoc("jvm")
+    sbtTestCommand   = "coreJVM/test;coreJS/test",
+    sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal"
   )
 
   lazy val scalatest: SbtCommunityProject = SbtCommunityProject(
@@ -506,10 +505,8 @@ object projects:
 
   lazy val scalaJava8Compat = SbtCommunityProject(
     project        = "scala-java8-compat",
-    // the fnGen subproject must be built with 2.12.x
-    sbtTestCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; test",
-    sbtPublishCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; publishLocal",
-    scalacOptions = Nil // avoid passing Scala 3 options to Scala 2.12 in fnGen subproject
+    sbtTestCommand = "test",
+    sbtPublishCommand = "publishLocal",
   )
 
   lazy val verify = SbtCommunityProject(
@@ -550,8 +547,8 @@ object projects:
 
   lazy val cats = SbtCommunityProject(
     project = "cats",
-    sbtTestCommand = "set Global/scalaJSStage := FastOptStage;buildJVM;validateAllJS",
-    sbtPublishCommand = "catsJVM/publishLocal;catsJS/publishLocal",
+    sbtTestCommand = "set Global/scalaJSStage := FastOptStage;rootJVM/test;rootJS/test",
+    sbtPublishCommand = "rootJVM/publishLocal;rootJS/publishLocal",
     dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations),
     scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init") // disable -Ysafe-init, due to -Xfatal-warning
 
@@ -755,7 +752,7 @@ object projects:
 
   lazy val http4s = SbtCommunityProject(
     project = "http4s",
-    sbtTestCommand = "tests/test; server/test; client/test; ember-core/test; ember-server/test; ember-client/test; circe/test",
+    sbtTestCommand = """set ThisBuild / tlFatalWarnings := false; server/test; client/test; ember-core/test; ember-server/test; ember-client/test; circe/test""",
     sbtPublishCommand = "publishLocal",
     scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"),
     dependencies = List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -25,6 +25,6 @@ object Dependencies {
     "com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
   )
 
-  val newCompilerInterface = "org.scala-sbt" % "compiler-interface" % "1.4.3"
+  val newCompilerInterface = "org.scala-sbt" % "compiler-interface" % "1.7.1"
   val oldCompilerInterface = "org.scala-sbt" % "compiler-interface" % "1.3.5"
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
diff --git a/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java b/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java
@@ -39,12 +39,13 @@ public void doReport(Diagnostic dia, Context ctx) {
     StringBuilder rendered = new StringBuilder();
     rendered.append(messageAndPos(dia, ctx));
     Message message = dia.msg();
+    String diagnosticCode = String.valueOf(message.errorId().errorNumber());
     boolean shouldExplain = Diagnostic.shouldExplain(dia, ctx);
     if (shouldExplain && !message.explanation().isEmpty()) {
       rendered.append(explanation(message, ctx));
     }
 
-    delegate.log(new Problem(position, message.msg(), severity, rendered.toString()));
+    delegate.log(new Problem(position, message.msg(), severity, rendered.toString(), diagnosticCode));
   }
 
   private static Severity severityOf(int level) {
diff --git a/sbt-bridge/src/dotty/tools/xsbt/DiagnosticCode.java b/sbt-bridge/src/dotty/tools/xsbt/DiagnosticCode.java
@@ -0,0 +1,23 @@
+package dotty.tools.xsbt;
+
+import java.util.Optional;
+
+final public class DiagnosticCode implements xsbti.DiagnosticCode {
+	private final String _code;
+	private final Optional<String> _explanation;
+
+	public DiagnosticCode(String code, Optional<String> explanation) {
+		super();
+		this._code = code;
+		this._explanation = explanation;
+	}
+
+	public String code() {
+		return _code;
+	}
+
+	public Optional<String> explanation() {
+		return _explanation;
+	}
+
+}
diff --git a/sbt-bridge/src/dotty/tools/xsbt/Problem.java b/sbt-bridge/src/dotty/tools/xsbt/Problem.java
@@ -9,13 +9,15 @@ final public class Problem implements xsbti.Problem {
   private final String _message;
   private final Severity _severity;
   private final Optional<String> _rendered;
+  private final String _diagnosticCode;
 
-  public Problem(Position position, String message, Severity severity, String rendered) {
+  public Problem(Position position, String message, Severity severity, String rendered, String diagnosticCode) {
     super();
     this._position = position;
     this._message = message;
     this._severity = severity;
     this._rendered = Optional.of(rendered);
+    this._diagnosticCode = diagnosticCode;
   }
 
   public String category() {
@@ -38,8 +40,17 @@ public Optional<String> rendered() {
     return _rendered;
   }
 
+  public Optional<xsbti.DiagnosticCode> diagnosticCode() {
+    // NOTE: It's important for compatibility that we only construct a
+    // DiagnosticCode here to maintain compatibility with older versions of
+    // zinc while using this newer version of the compiler. If we would
+    // contstruct it earlier, you'd end up with ClassNotFoundExceptions for
+    // DiagnosticCode.
+    return Optional.of(new DiagnosticCode(_diagnosticCode, Optional.empty()));
+  }
+
   @Override
   public String toString() {
-    return "Problem(" + _position + ", " + _message + ", " + _severity + ", " + _rendered + ")";
+    return "Problem(" + _position + ", " + _message + ", " + _severity + ", " + _rendered + ", " + _diagnosticCode + ")";
   }
 }
diff --git a/sbt-test/compilerReporter/simple/project/Reporter.scala b/sbt-test/compilerReporter/simple/project/Reporter.scala
@@ -36,6 +36,11 @@ object Reporter {
       assert(line.isPresent() == true)
       assert(line.get() == 9)
 
+      val diagnosticCode = mainProblem.diagnosticCode()
+      assert(diagnosticCode.isPresent() == true)
+      val code = diagnosticCode.get()
+      assert(diagnosticCode.get().code() == "6")
+
       val pointer = mainProblem.position().pointer()
       assert(pointer.isPresent() == true)
       assert(pointer.get() == 10)
diff --git a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
diff --git a/semanticdb/project/build.properties b/semanticdb/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ object Dependencies {`
`25`	`25`	`"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,`
`26`	`26`	`)`
`27`	`27`
`28`		`- val newCompilerInterface = "org.scala-sbt" % "compiler-interface" % "1.4.3"`
	`28`	`+ val newCompilerInterface = "org.scala-sbt" % "compiler-interface" % "1.7.1"`
`29`	`29`	`val oldCompilerInterface = "org.scala-sbt" % "compiler-interface" % "1.3.5"`
`30`	`30`	`}`