From 57254a6d32c0df3a965a9ae0db838518dccf6900 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 4 Oct 2024 00:12:56 -0400 Subject: [PATCH 1/2] deps: bump util --- build.sbt | 2 +- project/Dependencies.scala | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 2c4f88214..a4ecadc13 100644 --- a/build.sbt +++ b/build.sbt @@ -271,7 +271,7 @@ lazy val lmCore = (project in file("core")) exclude[DirectMissingMethodProblem]("sbt.librarymanagement.ScalaArtifacts.toolDependencies*"), ), ) - .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache) + .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache, addSbtCompilerInterface) lazy val lmIvy = (project in file("ivy")) // .enablePlugins(ContrabandPlugin, JsonCodecPlugin) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 860be2f06..776ac18f9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,13 +11,16 @@ object Dependencies { sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version") private val ioVersion = nightlyVersion.getOrElse("1.10.0") - private val utilVersion = nightlyVersion.getOrElse("2.0.0-alpha10") + private val utilVersion = nightlyVersion.getOrElse("2.0.0-M1") + private val zincVersion = nightlyVersion.getOrElse("2.0.0-M1") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val utilPosition = "org.scala-sbt" %% "util-position" % utilVersion private val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion - private val utilCache = "org.scala-sbt" %% "util-cache" % utilVersion + private val utilCache = ("org.scala-sbt" %% "util-cache" % utilVersion) + .exclude("org.scala-sbt", "compiler-interface") + private val compilerInterface = ("org.scala-sbt" % "compiler-interface" % zincVersion).force() def getSbtModulePath(key: String, name: String) = { val localProps = new java.util.Properties() @@ -29,6 +32,7 @@ object Dependencies { lazy val sbtIoPath = getSbtModulePath("sbtio.path", "sbt/io") lazy val sbtUtilPath = getSbtModulePath("sbtutil.path", "sbt/util") + lazy val sbtZincPath = getSbtModulePath("sbtzinc.path", "sbt/zinc") def addSbtModule(p: Project, path: Option[String], projectName: String, m: ModuleID) = path match { @@ -42,6 +46,8 @@ object Dependencies { def addSbtUtilLogging(p: Project): Project = addSbtModule(p, sbtUtilPath, "utilLogging", utilLogging) def addSbtUtilCache(p: Project): Project = addSbtModule(p, sbtUtilPath, "utilCache", utilCache) + def addSbtCompilerInterface(p: Project) = + addSbtModule(p, sbtZincPath, "compilerInterface", compilerInterface) val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.0" val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-396a783bba347016e7fe30dacc60d355be607fe2" From dc8dbc61edb80e2a1f2387cfabf94a7e48c16839 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 4 Oct 2024 00:18:39 -0400 Subject: [PATCH 2/2] Drop Ivy tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d938ee7f9..638973639 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,4 +35,4 @@ jobs: if: ${{ matrix.jobtype == 1 }} shell: bash run: | - sbt -v -Dfile.encoding=UTF8 scalafmtCheckAll +test +packagedArtifacts + sbt -v -Dfile.encoding=UTF8 scalafmtCheckAll compile lmCore/test +packagedArtifacts