Trying to fix scripted

sbt · Jul 8, 2023 · 010fc7a · 010fc7a
1 parent c725be2
commit 010fc7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -569,6 +569,7 @@ lazy val compilerBridge213_next = (project in (file(".sbt") / "matrix" / "compil
           (compilerBridge213 / Compile / scalaSource).value.getParentFile() / "resources" / "scala-2.13.12" / "DelegatingReporter.scala"
         )
     },
+    publishLocal / skip := false,
     publish / skip := true,
   )
 
@@ -718,7 +719,6 @@ lazy val zincScripted = (projectMatrix in internalPath / "zinc-scripted")
       compilerBridge211,
       compilerBridge212,
       compilerBridge213,
-      compilerBridge213_next
     )
   )
   .configure(addSbtUtilScripted)

diff --git a/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala b/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala
@@ -323,7 +323,7 @@ case class ProjectStructure(
 
   // We specify the class file manager explicitly even though it's noew possible
   // to specify it in the incremental option property file (this is the default for sbt)
-  val (incOptions, scalacOptions) = {
+  val (_incOptions, scalacOptions) = {
     val properties = loadIncProperties(baseDirectory)
     val (incOptions0, sco) = loadIncOptions(properties)
     val storeApis = Option(properties.getProperty("incOptions.storeApis"))
@@ -340,6 +340,7 @@ case class ProjectStructure(
         .withStoreApis(storeApis)
     (incO, sco)
   }
+  override def incOptions = _incOptions
   val exportPipelining = incOptions.pipelining
 
   def prev(useCachedAnalysis: Boolean = true) = {