From 2932685ed247b7038e0b1b44b31a5f0d5fe999c5 Mon Sep 17 00:00:00 2001 From: eugene yokota Date: Sun, 21 Jun 2026 01:31:40 -0400 Subject: [PATCH] [2.x] ipcsocket 1.7.0 (#9361) --- project/Dependencies.scala | 6 +++--- .../update-sbt-classifiers/build.sbt | 14 +------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b51dddc4a..c965b94a5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,8 +10,8 @@ object Dependencies { sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version") // sbt modules - val ioVersion = nightlyVersion.getOrElse("1.12.1") - val zincVersion = nightlyVersion.getOrElse("2.0.0-M18") + val ioVersion = nightlyVersion.getOrElse("1.12.2") + val zincVersion = nightlyVersion.getOrElse("2.0.0") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion @@ -19,7 +19,7 @@ object Dependencies { val launcherInterface = "org.scala-sbt" % "launcher-interface" % launcherVersion val rawLauncher = "org.scala-sbt" % "launcher" % launcherVersion val testInterface = "org.scala-sbt" % "test-interface" % "1.0" - val ipcSocket = "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.6.3" + val ipcSocket = "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.7.0" private val compilerInterface = "org.scala-sbt" % "compiler-interface" % zincVersion private val compilerClasspath = "org.scala-sbt" %% "zinc-classpath" % zincVersion diff --git a/sbt-app/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt b/sbt-app/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt index 3f075ed58..413e6b850 100644 --- a/sbt-app/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt @@ -20,6 +20,7 @@ lazy val root = (project in file(".")) val moduleIds = moduleReports.map(_.module).distinct val moduleIdsShort = moduleIds .filter(m => m.name != "launcher-interface") // I get different result locally + .filter(m => m.organization != "org.scala-sbt") .map(m => s"${m.organization}:${m.name}") val expectedModuleIds = Seq( @@ -41,7 +42,6 @@ lazy val root = (project in file(".")) "junit:junit", "net.java.dev.jna:jna", "net.java.dev.jna:jna-platform", - "net.openhft:zero-allocation-hashing", "org.checkerframework:checker-qual", "org.fusesource.jansi:jansi", "org.hamcrest:hamcrest-core", @@ -65,18 +65,6 @@ lazy val root = (project in file(".")) "org.scala-sbt.ipcsocket:ipcsocket", "org.scala-sbt.ivy:ivy", "org.scala-sbt.jline:jline", - "org.scala-sbt:compiler-interface", - "org.scala-sbt:io_3", - "org.scala-sbt:sbinary_3", - "org.scala-sbt:template-resolver", - "org.scala-sbt:test-interface", - "org.scala-sbt:zinc-apiinfo_3", - "org.scala-sbt:zinc-classfile_3", - "org.scala-sbt:zinc-classpath_3", - "org.scala-sbt:zinc-compile-core_3", - "org.scala-sbt:zinc-core_3", - "org.scala-sbt:zinc-persist_3", - "org.scala-sbt:zinc_3", "org.scala-sbt.gson:shaded-gson", "org.slf4j:slf4j-api", )