WIP use sbt 2.0.0-M4 & cross-build against it #440

bjaglin · 2024-10-05T21:37:56Z

https://www.scala-sbt.org/2.x/docs/en/changes/migrating-from-sbt-1.x.html
https://github.com/sbt/sbt/wiki/sbt-2.x-plugin-migration

https://github.com/sbt/sbt/releases/tag/v2.0.0-M4
- [2.x] fix: Fix semanticdbEnabled sbt/sbt#8029
- [2.x] Implement Def.inputTaskDyn sbt/sbt#8033

Remaining

scripted sbt2

[error]         sbt-scalafix/relax-scalacOptions
[error]         sbt-scalafix/scalafixOnCompile
[error]         skip-java17+/scalafixResolvers
[error]         skip-sbt1.4/cross-build-scala3
[error]         skip-sbt1.4/testkit

bjaglin · 2024-10-05T22:08:04Z

src/main/scala/scalafix/sbt/ScalafixEnable.scala

@@ -155,21 +155,21 @@ object ScalafixEnable {
                } else {
                  val latestAvailable =
                    tail.lastOption.getOrElse(earliestAvailable)
-                    Seq(


This was picked as significant indentation by the compiler (and has been also all along by scalafmt, as scala3 is aggressively/incorrectly used on all files as dialect), which was causing latestAvailable's type to be recursive ...

bjaglin · 2025-03-09T17:27:30Z

src/main/scala-3/scalafix/internal/sbt/Compat.scala

+      .get(Keys.moduleIDStr)
+      .map(Classpaths.moduleIdJsonKeyFormat.read)


sbt/sbt@34f9b7f

bjaglin · 2025-03-09T19:49:24Z

src/main/scala-3/scalafix/internal/sbt/Compat.scala

+  def toPath(
+      attributed: Attributed[HashedVirtualFileRef]
+  )(using conv: FileConverter): Path =
+    conv.toPath(attributed.data)
+
+  def toFile(
+      attributed: Attributed[HashedVirtualFileRef]
+  )(using conv: FileConverter): File =
+    toPath(attributed).toFile()


https://www.scala-sbt.org/2.x/docs/en/changes/migrating-from-sbt-1.x.html#migrating-classpath-type

bjaglin · 2025-03-09T20:26:15Z

.scalafix.conf

+   "sbt."
+   "*"
+ ]
+  targetDialect = Scala3


Thanks to -Xsource:3 (which was added by default for sbt1 but was removed in sbt2, needing an explicit addition in this PR), Scala 3 import syntax can be used sbt1 metabuilds (and thus sb1 plugins) .

So we might as well start using OrganizeImports with Scala 3 syntax for all files (not just the Scala 3 ones), as we start enforcing scalafix for ExplicitResultTypes

bjaglin · 2025-03-09T20:39:11Z

project/Dependencies.scala

@@ -7,6 +7,7 @@ object Dependencies {
  val all = List(
    "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.3.202401111512-r",
    "ch.epfl.scala" % "scalafix-interfaces" % scalafixVersion,
-    "io.get-coursier" % "interface" % "1.0.28"
+    "io.get-coursier" % "interface" % "1.0.28",
+    "org.scala-lang.modules" %% "scala-collection-compat" % "2.13.0"


helps getting rid of import scala.collection.JavaConverters.* mostly

bjaglin · 2025-03-10T19:57:40Z

.github/workflows/ci.yml

      - run: ./bin/scalafmt --test
+      - run: sbt "scalafixAll --check"


enforcing scalafix in this PR mostly for ExplicitResultTypes, to have deterministic types from the beginning for the sbt 2.x artifact

bjaglin · 2025-03-13T07:17:14Z

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=2.0.0-M4


⚠️ this currently breaks metals integration (even with BSP handled by sbt itself rather than metals) pending sbt-metals cross-publishing to 2.0.0-M4

bjaglin · 2025-03-13T07:25:33Z

.github/workflows/ci.yml

+    strategy:
+      fail-fast: false
+      matrix:
+        scala: ["2.12"]


⚠️ sbt2 does not seem to start on CI windows

Run sbt ++2.12 test-skip-windows scripted [info] entering *experimental* thin client - BEEP WHIRR [info] server was not detected. starting an instance [error] Failed to start server : java.io.IOException: Cannot run program "C:/Program Files" (in directory "D:\a\sbt-scalafix\sbt-scalafix"): CreateProcess error=5, Access is denied [error] failed to connect to server

bjaglin · 2025-03-13T07:26:48Z

project/plugins.sbt

@@ -1,12 +1,12 @@
 resolvers ++= Resolver.sonatypeOssRepos("public")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
+//addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")


⚠️ pending cross-publishing to 2.0.0-M4

bjaglin · 2025-03-13T21:42:58Z

src/sbt-test/sbt-scalafix/basic/build.sbt

@@ -38,7 +36,7 @@ checkLogs := {
    .map(_.replaceAll("\u001B\\[[;\\d]*m", "")) // remove control chars (colors)
    .force
  assert(
-    logLines.exists(_ == "[error] -import scala.concurrent.Future"),
+    logLines.exists(_.startsWith("[error] -import scala.concurrent.Future")),


for some weird reason, the lines have non-visible trailing characters when the scripted is run from sbt2 in JDK<21

bjaglin · 2025-03-13T23:21:42Z

.github/workflows/ci.yml

@@ -72,12 +38,14 @@ jobs:
          apps: sbt
      - run: rm -r -fo src\sbt-test\skip-sbt1.4
      - run: rm -r -fo src\sbt-test\skip-windows
-      - run: sbt test-skip-windows scripted
-        shell: bash


The presence of this was triggering sbtn usage, which does not seem to work on any github action

before

Run sbt -v '++2.12.x test-skip-windows scripted' sbt -v '++2.12.x test-skip-windows scripted' shell: C:\Program Files\Git\bin\bash.EXE --noprofile --norc -e -o pipefail {0} env: COURSIER_BIN_DIR: C:\Users\runneradmin\cs\bin [sbt_options] declare -a sbt_options=() [debug] running native client # Executing command line: "/c/Program Files (x86)/sbt/bin/sbtn-x86_64-pc-win32.exe" "--sbt-script=/c/Program%20Files (x86)/sbt/bin/sbt" -v "++2.12.x test-skip-windows scripted" [info] entering *experimental* thin client - BEEP WHIRR [info] server was not detected. starting an instance [error] Failed to start server : java.io.IOException: Cannot run program "C:/Program Files" (in directory "D:\a\sbt-scalafix\sbt-scalafix"): CreateProcess error=5, Access is denied [error] failed to connect to server

after

Started at 1741908079000 Run sbt ++2.12.x test-skip-windows scripted sbt ++2.12.x test-skip-windows scripted shell: C:\Program Files\PowerShell\7\pwsh.EXE -command ". '{0}'" env: COURSIER_BIN_DIR: C:\Users\runneradmin\cs\bin [info] [launcher] getting org.scala-sbt sbt 2.0.0-M4 (this may take some time)... [info] [launcher] getting Scala 3.6.4 (for sbt)... [info] welcome to sbt 2.0.0-M4 (Temurin Java 1.8.0_442)

sbt/sbt#8064

bjaglin force-pushed the sbt2 branch 3 times, most recently from c9451e2 to 42e7e69 Compare October 5, 2024 22:05

bjaglin changed the title ~~sbt 2.x~~ cross-build to sbt 2.x Oct 5, 2024

bjaglin commented Oct 5, 2024

View reviewed changes

bjaglin force-pushed the sbt2 branch 2 times, most recently from 0bc3b43 to 50acf94 Compare October 5, 2024 22:19

bjaglin changed the title ~~cross-build to sbt 2.x~~ WIP cross-build to sbt 2.x Feb 16, 2025

bjaglin force-pushed the sbt2 branch from 50acf94 to 8730207 Compare February 16, 2025 22:46

mrdziuban mentioned this pull request Feb 28, 2025

[2.x] ConcurrentModificationException in SbtParser sbt/sbt#7873

Closed

bjaglin force-pushed the sbt2 branch 2 times, most recently from ea0dc68 to 077670f Compare March 9, 2025 17:12

bjaglin commented Mar 9, 2025

View reviewed changes

bjaglin force-pushed the sbt2 branch 4 times, most recently from ffeacb0 to 1b3e208 Compare March 9, 2025 18:07

bjaglin changed the title ~~WIP cross-build to sbt 2.x~~ WIP cross-build against sbt 2.0.0-M4 Mar 9, 2025

bjaglin force-pushed the sbt2 branch 3 times, most recently from 4060b04 to 55d9026 Compare March 9, 2025 19:22

bjaglin closed this Mar 9, 2025

bjaglin force-pushed the sbt2 branch from 55d9026 to 2d04dfd Compare March 9, 2025 19:29

bjaglin reopened this Mar 9, 2025

bjaglin force-pushed the sbt2 branch 3 times, most recently from 0ffcf86 to ab7704f Compare March 9, 2025 19:45

bjaglin commented Mar 9, 2025

View reviewed changes

bjaglin force-pushed the sbt2 branch 2 times, most recently from 9ea8c73 to 31bc4fc Compare March 10, 2025 01:30

bjaglin commented Mar 10, 2025

View reviewed changes

bjaglin force-pushed the sbt2 branch 5 times, most recently from cdf1d14 to 539b3f4 Compare March 12, 2025 08:15

bjaglin closed this Mar 12, 2025

bjaglin force-pushed the sbt2 branch from 539b3f4 to 2d04dfd Compare March 12, 2025 09:21

bjaglin reopened this Mar 12, 2025

bjaglin force-pushed the sbt2 branch 3 times, most recently from cf75fe4 to 42dcb6e Compare March 12, 2025 20:47

bjaglin commented Mar 13, 2025

View reviewed changes

bjaglin force-pushed the sbt2 branch from f85eba2 to b25dfaa Compare March 13, 2025 07:24

bjaglin commented Mar 13, 2025

View reviewed changes

bjaglin force-pushed the sbt2 branch from b25dfaa to 72d0379 Compare March 13, 2025 07:28

bjaglin changed the title ~~WIP cross-build against sbt 2.0.0-M4~~ WIP use sbt 2.0.0-M4 & cross-build against it Mar 13, 2025

bjaglin force-pushed the sbt2 branch from 72d0379 to b9bb468 Compare March 13, 2025 21:41

bjaglin commented Mar 13, 2025

View reviewed changes

bjaglin force-pushed the sbt2 branch 2 times, most recently from ac9bc6a to e5e2f7d Compare March 13, 2025 21:55

cross-build against sbt 2.0.0-M4

aabf0ba

bjaglin force-pushed the sbt2 branch 2 times, most recently from 17b11e4 to 6e22571 Compare March 13, 2025 23:18

build with sbt2

54167db

bjaglin force-pushed the sbt2 branch from 6e22571 to 54167db Compare March 13, 2025 23:20

bjaglin commented Mar 13, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP use sbt 2.0.0-M4 & cross-build against it #440

WIP use sbt 2.0.0-M4 & cross-build against it #440

bjaglin commented Oct 5, 2024 •

edited

Loading

bjaglin Oct 5, 2024 •

edited

Loading

bjaglin Mar 9, 2025

bjaglin Mar 9, 2025

bjaglin Mar 9, 2025 •

edited

Loading

bjaglin Mar 9, 2025

bjaglin Mar 10, 2025

bjaglin Mar 13, 2025 •

edited

Loading

bjaglin Mar 13, 2025

bjaglin Mar 13, 2025

bjaglin Mar 13, 2025

bjaglin Mar 13, 2025 •

edited

Loading

bjaglin Mar 13, 2025

		.get(Keys.moduleIDStr)
		.map(Classpaths.moduleIdJsonKeyFormat.read)

		- run: ./bin/scalafmt --test
		- run: sbt "scalafixAll --check"

		@@ -1 +1 @@
		sbt.version=1.10.7
		sbt.version=2.0.0-M4

WIP use sbt 2.0.0-M4 & cross-build against it #440

Are you sure you want to change the base?

WIP use sbt 2.0.0-M4 & cross-build against it #440

Conversation

bjaglin commented Oct 5, 2024 • edited Loading

bjaglin Oct 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bjaglin Mar 9, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bjaglin Mar 13, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bjaglin Mar 13, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bjaglin commented Oct 5, 2024 •

edited

Loading

bjaglin Oct 5, 2024 •

edited

Loading

bjaglin Mar 9, 2025 •

edited

Loading

bjaglin Mar 13, 2025 •

edited

Loading

bjaglin Mar 13, 2025 •

edited

Loading