[2.x] Merge 1.10.x

.github/workflows/cla.yml

@@ -4,21 +4,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
     - name: Check CLA
-      env:
-        AUTHOR: ${{ github.event.pull_request.user.login }}
-      run: |
-        echo "Pull request submitted by $AUTHOR";
-        signed=$(curl -s "https://contribute.akka.io/contribute/cla/scala/check/$AUTHOR" | jq -r ".signed");
-        if [ "$signed" = "true" ] ; then
-          echo "CLA check for $AUTHOR successful";
-        else
-          echo "CLA check for $AUTHOR failed";
-          echo "Please sign the Scala CLA to contribute to the Scala compiler.";
-          echo "Go to https://contribute.akka.io/contribute/cla/scala and then";
-          echo "comment on the pull request to ask for a new check.";
-          echo "";
-          echo "Check if CLA is signed: https://contribute.akka.io/contribute/cla/scala/check/$AUTHOR";
-          exit 1;
-        fi;
+      uses: scala/cla-checker@v1
+      with:
+        author: ${{ github.event.pull_request.user.login }}

build.sbt

@@ -75,8 +75,9 @@ ThisBuild / developers := List(
 )
 ThisBuild / pomIncludeRepository := (_ => false) // drop repos other than Maven Central from POM
 ThisBuild / publishTo := {
-  val nexus = "https://oss.sonatype.org/"
-  Some("releases" at nexus + "service/local/staging/deploy/maven2")
+  val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
+  if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
+  else localStaging.value
 }
 ThisBuild / mimaPreviousArtifacts := Set.empty
 // limit the number of concurrent test so testQuick works
@@ -306,7 +307,7 @@ lazy val zincBenchmarks = (projectMatrix in internalPath / "zinc-benchmarks")
     baseSettings,
     name := "Benchmarks of Zinc and the compiler bridge",
     libraryDependencies ++= Seq(
-      "org.eclipse.jgit" % "org.eclipse.jgit" % "6.10.0.202406032230-r",
+      "org.eclipse.jgit" % "org.eclipse.jgit" % "6.10.1.202505221210-r",
       "net.openhft" % "affinity" % "3.23.3",
     ),
     Test / javaOptions ++= List("-Xmx600M", "-Xms600M"),

internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala

@@ -98,7 +98,6 @@ private[inc] abstract class IncrementalCommon(
         invalidatedSources,
         classfileManager,
         pruned,
-        previous,
         classesToRecompile,
         profiler.registerCycle(
           invalidatedClasses,
@@ -149,11 +148,11 @@ private[inc] abstract class IncrementalCommon(
         invalidatedSources: Set[VirtualFile],
         classFileManager: XClassFileManager,
         pruned: Analysis,
-        override val previousAnalysis: Analysis,
         classesToRecompile: Set[String],
         registerCycle: (Set[String], APIChanges, Set[String], Boolean) => Unit
     ) extends IncrementalCallback(classFileManager) {
       override val isFullCompilation: Boolean = allSources.subsetOf(invalidatedSources)
+      override val previousAnalysis: Analysis = previous
       override val previousAnalysisPruned: Analysis = pruned
 
       override def mergeAndInvalidate(
@@ -165,10 +164,12 @@ private[inc] abstract class IncrementalCommon(
             partialAnalysis.copy(compilations = pruned.compilations ++ partialAnalysis.compilations)
           else pruned ++ partialAnalysis
 
-        // Represents classes detected as changed externally and internally (by a previous cycle)
+        // Represents all classes that were compiled as a result of external and internal invalidation (by a previous cycle)
         // Maps the changed sources by the user to class names we can count as invalidated
         val getClasses = (a: Analysis) => initialChangedSources.flatMap(a.relations.classNames)
-        val recompiledClasses = classesToRecompile ++ getClasses(previous) ++ getClasses(analysis)
+        val recompiledClasses = classesToRecompile ++
+          getClasses(previous) ++ getClasses(analysis) ++
+          invalidatedSources.flatMap(previous.relations.classNames)
 
         val newApiChanges =
           detectAPIChanges(recompiledClasses, previous.apis.internalAPI, analysis.apis.internalAPI)
@@ -505,11 +506,11 @@ private[inc] abstract class IncrementalCommon(
       Set.empty
     } else {
       if (invalidateTransitively) {
-        val firstClassTransitiveInvalidation = includeTransitiveInitialInvalidations(
-          initial,
-          IncrementalCommon.transitiveDeps(initial, log)(dependsOnClass),
-          dependsOnClass
-        )
+        // NOTE: As member reference relations do not include local relations, this invalidation will fully propagate
+        // thus we can't rely solely on `firstClassTransitiveInvalidation`. Better bet is to try to find transitive
+        // dependencies from result of `firstClassInvalidation`
+        val firstClassTransitiveInvalidation =
+          IncrementalCommon.transitiveDeps(firstClassInvalidation, log)(dependsOnClass)
         log.debug("Invalidate by brute force:\n\t" + firstClassTransitiveInvalidation)
         firstClassTransitiveInvalidation ++ secondClassInvalidation ++ thirdClassInvalidation ++ recompiledClasses
       } else {

internal/zinc-core/src/main/scala/sbt/internal/inc/Relations.scala

@@ -184,14 +184,15 @@ trait Relations {
   private[inc] def externalDependencies: ExternalDependencies
 
   /**
-   * The class dependency relation between classes introduced by member reference.
+   * The class dependency relation between classes introduced
+   * by member reference excluding excluding same-source references.
    *
    * NOTE: All inheritance dependencies are included in this relation because in order to
    * inherit from a member you have to refer to it. If you check documentation of `inheritance`
    * you'll see that there's small oddity related to traits being the first parent of a
    * class/trait that results in additional parents being introduced due to normalization.
-   * This relation properly accounts for that so the invariant that `memberRef` is a superset
-   * of `inheritance` is preserved.
+   *
+   * Because `inheritance` includes same-source references, `memberRef` is not a superset of `inheritance`
    */
   private[inc] def memberRef: ClassDependencies
 

internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala

@@ -12,17 +12,6 @@
 // Based on zinc's FileAnalysisStore:
 package sbt.internal.inc.consistent
 
-/*
- * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
- *
- * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
- *
- * See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- */
-
 import sbt.io.{ IO, Using }
 import xsbti.compile.analysis.ReadWriteMappers
 import xsbti.compile.{ AnalysisContents, AnalysisStore => XAnalysisStore }

internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala

@@ -232,9 +232,9 @@ class IncHandler(directory: Path, cacheDir: Path, scriptedLog: ManagedLogger, co
     onArgs("checkIterations") {
       case (p, x :: Nil, i) => p.checkNumberOfCompilerIterations(i, x.toInt)
     },
-    // onArgs("checkCycles") {
-    //   case (p, x :: Nil, i) => p.checkNumberOfCycles(i, x.toInt)
-    // },
+    onArgs("checkNumberOfLibraries") {
+      case (p, x :: Nil, i) => p.checkNumberOfLibraries(i, x.toInt)
+    },
     // note that this can only tell us the *last* round a class got compiled in.
     // it can't tell us *every* round something got compiled in, since only
     // still-extant classfiles are available for inspection
@@ -533,6 +533,14 @@ case class ProjectStructure(
       ()
     }
 
+  def checkNumberOfLibraries(i: IncState, expected: Int): Future[Unit] =
+    compile(i).map { analysis =>
+      val count = analysis.stamps.libraries.size
+      val msg = s"analysis.stamps.libraries.size = $count (expected $expected)"
+      assert(count == expected, msg)
+      ()
+    }
+
   def run(i: IncState, params: Seq[String]): Future[Unit] =
     compile(i).map { analysis =>
       discoverMainClasses(Some(analysis.apis)) match {
@@ -811,7 +819,6 @@ case class ProjectStructure(
       Optional.empty[ExternalHooks.Lookup],
       Optional.empty[XClassFileManager]
     )
-    // .withInvalidationProfiler(profiler)
     val base = IncOptions
       .of()
       .withPipelining(defaultPipelining)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.6
+sbt.version=1.11.2

project/plugins.sbt

@@ -2,12 +2,12 @@ scalacOptions += "-feature"
 
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.7.0")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
-addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.1")
+addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
-addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2")
+addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.3")

zinc/src/main/scala/sbt/internal/inc/javac/AnalyzingJavaCompiler.scala

@@ -169,7 +169,7 @@ final class AnalyzingJavaCompiler private[sbt] (
         val javaSources: Array[VirtualFile] =
           sources.sortBy(_.id).toArray
         // TODO: https://github.com/sbt/sbt/issues/7883
-        // debug(log, prettyPrintCompilationArguments(args))
+        // log.debug(InterfaceUtil.toSupplier(prettyPrintCompilationArguments(args)))
         val success =
           javac.run(javaSources, args, output, incToolOptions, reporter, log)
         if (!success) {

zinc/src/sbt-test/source-dependencies/anon-class-dep/A/Refined.scala

@@ -0,0 +1,8 @@
+package A
+
+class SRC[_]
+class Refined {
+  def select() = new {
+    def using(opt: Option[SRC[_]] => Some[SRC[_]]) = opt
+  }
+}

zinc/src/sbt-test/source-dependencies/anon-class-dep/B/Client.scala

@@ -0,0 +1,7 @@
+package B
+
+import A.Refined
+
+class Client {
+  def temp = new Refined().select().using(null)
+}

zinc/src/sbt-test/source-dependencies/anon-class-dep/build.json

@@ -0,0 +1,15 @@
+{
+  "projects": [
+    {
+      "name": "B",
+      "dependsOn": [
+        "A"
+      ],
+      "scalaVersion": "2.13.x"
+    },
+    {
+      "name": "A",
+      "scalaVersion": "2.13.x"
+    }
+  ]
+}

zinc/src/sbt-test/source-dependencies/anon-class-dep/test

@@ -0,0 +1,2 @@
+> B/compile
+> B/checkNumberOfLibraries 1

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation-trait/A.scala

@@ -0,0 +1,3 @@
+trait A {
+  def buildNonemptyObjects(a: Int): Int = a
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation-trait/App.scala

@@ -0,0 +1,4 @@
+object Main extends App {
+  val x: C = new C { }
+  val z: Int = x.x
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation-trait/B.scala

@@ -0,0 +1,6 @@
+trait C extends B {
+  def x = something
+}
+trait B extends A {
+  def something = buildNonemptyObjects(5)
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation-trait/changes/A.scala

@@ -0,0 +1,4 @@
+trait A {
+  // change return type Int => String
+  def buildNonemptyObjects(a: Int): String = ""
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation-trait/changes/OriginalA.scala

@@ -0,0 +1,3 @@
+trait A {
+  def buildNonemptyObjects(a: Int): Int = a
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation-trait/changes/incOptions.properties

@@ -0,0 +1 @@
+transitiveStep = 3

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation-trait/incOptions.properties

@@ -0,0 +1 @@
+transitiveStep = 1

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation-trait/test

@@ -0,0 +1,21 @@
+#####################  FAILURE  ############################
+# clean build that compiles with transitiveStep = 1
+> compile
+
+# incremental build that should fail with transitiveStep = 1
+$ copy-file changes/A.scala A.scala
+-> compile
+
+#####################  FAILURE  ############################
+
+# rerun the test with transitiveStep = 3
+> clean
+$ copy-file changes/OriginalA.scala A.scala
+$ copy-file changes/incOptions.properties incOptions.properties
+
+# clean build that compiles with transitiveStep = 3
+> compile
+
+# incremental build that should fail with transitiveStep = 3
+$ copy-file changes/A.scala A.scala
+-> compile

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation/A.scala

@@ -0,0 +1,3 @@
+object A {
+  def buildNonemptyObjects(a: Int): Int = a
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation/App.scala

@@ -0,0 +1,3 @@
+object Main extends App {
+  val z: Int = C.x
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation/B.scala

@@ -0,0 +1,7 @@
+object C {
+  def x = B.something
+}
+
+object B {
+  def something = A.buildNonemptyObjects(5)
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation/changes/A.scala

@@ -0,0 +1,4 @@
+object A {
+  // change return type Int => String
+  def buildNonemptyObjects(a: Int): String = ""
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation/changes/OriginalA.scala

@@ -0,0 +1,3 @@
+object A {
+  def buildNonemptyObjects(a: Int): Int = a
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation/changes/WorkingA.scala

@@ -0,0 +1,4 @@
+object A {
+  // add default param
+  def buildNonemptyObjects(a: Int, b: Int = 5): Int = a
+}

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation/changes/incOptions.properties

@@ -0,0 +1 @@
+transitiveStep = 3

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation/incOptions.properties

@@ -0,0 +1 @@
+transitiveStep = 1

zinc/src/sbt-test/source-dependencies/same-source-transitive-invalidation/test

@@ -0,0 +1,33 @@
+#####################  SUCCESS  ############################
+# clean build that compiles with transitiveStep = 1
+> compile
+
+# incremental build that should work with transitiveStep = 1
+$ copy-file changes/WorkingA.scala A.scala
+> compile
+# > checkIterations 2 this is not yet working, but it should be 2
+
+#####################  FAILURE  ############################
+
+# clean build that compiles with transitiveStep = 1
+> clean
+$ copy-file changes/OriginalA.scala A.scala
+> compile
+
+# incremental build that should fail with transitiveStep = 1
+$ copy-file changes/A.scala A.scala
+-> compile
+
+#####################  FAILURE  ############################
+
+# rerun the test with transitiveStep = 3
+> clean
+$ copy-file changes/OriginalA.scala A.scala
+$ copy-file changes/incOptions.properties incOptions.properties
+
+# clean build that compiles with transitiveStep = 3
+> compile
+
+# incremental build that should fail with transitiveStep = 3
+$ copy-file changes/A.scala A.scala
+-> compile