invalidate cache on -cli/-core/scalameta bump via scalafix-interface

scalacenter · May 16, 2020 · 9828f94 · 9828f94
1 parent d497fc2
commit 9828f94
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 6 deletions.
diff --git a/src/main/scala/scalafix/sbt/ScalafixPlugin.scala b/src/main/scala/scalafix/sbt/ScalafixPlugin.scala
@@ -1,5 +1,6 @@
 package scalafix.sbt
 
+import java.net.URLClassLoader
 import java.nio.file.Path
 
 import com.geirsson.coursiersmall.Repository
@@ -12,6 +13,7 @@ import sbt.internal.sbtscalafix.Caching._
 import scalafix.interfaces.ScalafixError
 import scalafix.internal.sbt._
 
+import scala.annotation.tailrec
 import scala.util.Try
 import scala.util.control.NoStackTrace
 
@@ -253,12 +255,27 @@ object ScalafixPlugin extends AutoPlugin {
 
       implicit val stamper = new CacheKeysStamper {
         override protected def stamp: Arg.CacheKey => Unit = {
-          case Arg.ToolClasspath(classLoader) =>
-            val urls = classLoader.getURLs
-            // to keep it simple, don't support caching when dealing with directories
-            if (urls.exists(_.toString.endsWith("/"))) throw StampingImpossible
-            // and assume JARs are stable (a new version would have a different URL)
-            write(classLoader.getURLs)
+          case Arg.ToolClasspath(toolClassLoader) =>
+            @tailrec def withParentRec(classLoader: URLClassLoader): Unit = {
+              val urls = classLoader.getURLs
+              // to keep it simple, don't support caching when dealing with directories
+              if (urls.exists(_.toString.endsWith("/")))
+                throw StampingImpossible
+              // and assume JARs are stable (a new version would have a different URL)
+              write(urls)
+              classLoader.getParent match {
+                case parent: URLClassLoader =>
+                  // stamp also the JARs in the parent
+                  withParentRec(parent)
+                case _: ScalafixInterfacesClassloader =>
+                  // expected root of sbt-scalafix-managed tool classpaths
+                  ()
+                case _ =>
+                  // the class loader layering is unexpected, don't cache to be safe
+                  throw StampingImpossible
+              }
+            }
+            withParentRec(toolClassLoader)
           case Arg.Rules(rules) =>
             rules.foreach {
               case source

diff --git a/src/sbt-test/skip-windows/caching/test b/src/sbt-test/skip-windows/caching/test
@@ -252,3 +252,31 @@ $ copy-file files/Valid.scala src/main/scala/Valid.scala
 $ exec chmod 000 src/main/scala/Valid.scala
 -> scalafix ProcedureSyntax
 $ delete src/main/scala
+
+# make sure cache is invalidated after changing scalafix version
+> set scalafixConfig := None
+$ mkdir src/main/scala
+$ copy-file files/Valid.scala src/main/scala/Valid.scala
+> scalafix --check ProcedureSyntax
+> reload plugins
+> 'set dependencyOverrides := Seq("ch.epfl.scala" % "scalafix-interfaces" % "0.9.14")' // anything else than above
+> session save
+> reload return
+$ exec chmod 000 src/main/scala/Valid.scala
+-> scalafix --check ProcedureSyntax
+$ delete src/main/scala
+
+# make sure cache is invalidated after changing scalafix version when no custom dependency is set
+> set scalafixConfig := None
+$ mkdir src/main/scala
+$ copy-file files/Valid.scala src/main/scala/Valid.scala
+> set scalafixDependencies in ThisBuild := Nil
+> scalafix --check ProcedureSyntax
+> reload plugins
+> 'set dependencyOverrides := Seq("ch.epfl.scala" % "scalafix-interfaces" % "0.9.13")' // anything else than current
+> session save
+> reload return
+> set scalafixDependencies in ThisBuild := Nil
+$ exec chmod 000 src/main/scala/Valid.scala
+-> scalafix --check ProcedureSyntax
+$ delete src/main/scala