From 94c5c6949c7cccb3bbda2238f88a73eeb36843e5 Mon Sep 17 00:00:00 2001 From: ckipp01 Date: Mon, 13 Apr 2020 17:24:14 +0200 Subject: [PATCH 1/3] update sbt and coursier --- project/Dependencies.scala | 7 ++++--- project/ScalafixBuild.scala | 8 +++----- project/build.properties | 2 +- project/plugins.sbt | 3 --- project/project/plugins.sbt | 1 - sbt | Bin 23487 -> 23341 bytes 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5a055f2d5..dbc11d984 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,6 +8,7 @@ object Dependencies { def scala211 = "2.11.12" def scala212 = "2.12.11" def scala213 = "2.13.1" + def coursierV = "2.0.0-RC5-6" val currentScalaVersion = scala212 val jgit = "org.eclipse.jgit" % "org.eclipse.jgit" % "5.6.0.201912101111-r" @@ -25,7 +26,7 @@ object Dependencies { def testsDeps = List( // integration property tests - "io.get-coursier" %% "coursier" % "2.0.0-RC5-6", + "io.get-coursier" %% "coursier" % coursierV, "org.scala-lang.modules" %% "scala-xml" % "1.2.0", "org.typelevel" %% "cats-core" % "2.0.0", "com.typesafe.slick" %% "slick" % "3.3.2", @@ -34,7 +35,7 @@ object Dependencies { ) def coursierDeps = Seq( - "io.get-coursier" %% "coursier" % coursier.util.Properties.version, - "io.get-coursier" %% "coursier-cache" % coursier.util.Properties.version + "io.get-coursier" %% "coursier" % coursierV, + "io.get-coursier" %% "coursier-cache" % coursierV ) } diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala index b2b3ae4bc..d0036979e 100644 --- a/project/ScalafixBuild.scala +++ b/project/ScalafixBuild.scala @@ -32,9 +32,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { lazy val isFullCrossVersion = Seq( crossVersion := CrossVersion.full ) - lazy val isScala213 = Def.setting { - scalaVersion.value.startsWith("2.13") - } + lazy val isScala213 = Def.setting { scalaVersion.value.startsWith("2.13") } lazy val warnUnusedImports = Def.setting { if (isScala213.value) "-Ywarn-unused:imports" else "-Ywarn-unused-import" @@ -59,7 +57,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { name, version, stableVersion, - "coursier" -> coursier.util.Properties.version, + "coursier" -> coursierV, "nightly" -> version.value, "scalameta" -> scalametaV, scalaVersion, @@ -155,7 +153,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { "stableVersion" -> stableVersion.value, "scalametaVersion" -> scalametaV, "supportedScalaVersions" -> supportedScalaVersions, - "coursierVersion" -> coursier.util.Properties.version + "coursierVersion" -> coursierV ) ), fork in tut := true diff --git a/project/build.properties b/project/build.properties index c0bab0494..06703e34d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index c4b3484b2..d5172b07e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,5 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.2") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") -addSbtPlugin( - "io.get-coursier" % "sbt-coursier" % coursier.util.Properties.version -) addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0") // exclude is a workaround for https://github.com/sbt/sbt-assembly/issues/236#issuecomment-294452474 diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index b11805ec5..1ed4d0bd5 100644 --- a/project/project/plugins.sbt +++ b/project/project/plugins.sbt @@ -1,3 +1,2 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.23") -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC3-3") unmanagedSources.in(Compile) += baseDirectory.value / ".." / "Dependencies.scala" diff --git a/sbt b/sbt index 4a2935c3da68723589f48c97a30e9fb165ee1773..e15fadbdfdf09ecdfe3e7d7e3c82bc4949275a45 100755 GIT binary patch literal 23341 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 Date: Tue, 14 Apr 2020 09:20:44 +0000 Subject: [PATCH 2/3] Enable forking when running tests. The Scalafix test suite uses `this.getClass.getClassLoader` to lookup symbols from scala-library.jar. In sbt v1.3.x, the default classloader layering strategy changed so that `this.getClass.getClassLoader` only contains Scalafix-defined classes, with classes from dependency classes coming from a parent classloader. This commit makes the tests pass on sbt v1.3.x by enabling forking so that `this.getClass.getClassLoader` is always a flat classloader containing all classes. --- build.sbt | 6 ++++-- .../scala-2.12/scalafix/tests/cli/ScalafixImplSuite.scala | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index c58f1bfdc..73b82c139 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ inThisBuild( onLoadMessage := s"Welcome to scalafix ${version.value}", scalaVersion := scala212, crossScalaVersions := List(scala212, scala211), - fork.in(Test, test) := true + fork := true ) ) @@ -169,7 +169,8 @@ lazy val unit = project .in(file("scalafix-tests/unit")) .settings( noPublish, - fork := false, + // Change working directory to match when `fork := false`. + baseDirectory.in(Test) := baseDirectory.in(ThisBuild).value, javaOptions := Nil, buildInfoPackage := "scalafix.tests", buildInfoObject := "BuildInfo", @@ -251,6 +252,7 @@ lazy val docs = project .in(file("scalafix-docs")) .settings( noMima, + baseDirectory.in(run) := baseDirectory.in(ThisBuild).value, skip in publish := true, moduleName := "scalafix-docs", scalaVersion := scala212, diff --git a/scalafix-tests/unit/src/test/scala-2.12/scalafix/tests/cli/ScalafixImplSuite.scala b/scalafix-tests/unit/src/test/scala-2.12/scalafix/tests/cli/ScalafixImplSuite.scala index b17b330ff..5515d45fb 100644 --- a/scalafix-tests/unit/src/test/scala-2.12/scalafix/tests/cli/ScalafixImplSuite.scala +++ b/scalafix-tests/unit/src/test/scala-2.12/scalafix/tests/cli/ScalafixImplSuite.scala @@ -82,7 +82,7 @@ class ScalafixImplSuite extends FunSuite with DiffAssertions { } test("error") { - val cl = new URLClassLoader(Array()) + val cl = new URLClassLoader(Array(), null) val ex = intercept[ScalafixException] { i.Scalafix.classloadInstance(cl) } From ac9d7a60b29b2245d0c8ddd702b9dd27195cbde0 Mon Sep 17 00:00:00 2001 From: Olafur Pall Geirsson Date: Tue, 14 Apr 2020 10:12:25 +0000 Subject: [PATCH 3/3] Make documentation generation run on JDK 11 --- .../src/main/scala/scalafix/docs/PatchDocs.scala | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scalafix-docs/src/main/scala/scalafix/docs/PatchDocs.scala b/scalafix-docs/src/main/scala/scalafix/docs/PatchDocs.scala index a242bfc10..2db28fb32 100644 --- a/scalafix-docs/src/main/scala/scalafix/docs/PatchDocs.scala +++ b/scalafix-docs/src/main/scala/scalafix/docs/PatchDocs.scala @@ -1,5 +1,7 @@ package scalafix.docs +import java.nio.file.Paths +import java.io.File import org.typelevel.paiges.Doc import scala.meta.inputs.Input import scala.meta.interactive.InteractiveSemanticdb @@ -101,7 +103,12 @@ object PatchDocs { "-Ywarn-unused", "-P:semanticdb:synthetics:on" ) - lazy val compiler = InteractiveSemanticdb.newCompiler(scalacOptions) + lazy val classpath = ClasspathOps + .getURLs(this.getClass().getClassLoader()) + .map(p => Paths.get(p.toURI())) + .mkString(File.pathSeparator) + lazy val compiler = + InteractiveSemanticdb.newCompiler(classpath, scalacOptions) lazy val symtab = GlobalSymbolTable(ClasspathOps.thisClasspath, includeJdk = true) lazy val scalafixSymtab = new Symtab { self =>