From 79d7832a358305057b74b6e87656540b342c9684 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 21 Mar 2021 15:58:10 -0400 Subject: [PATCH 1/2] lm-coursier-shaded 2.0.8 Fixes https://github.com/sbt/sbt/issues/6243 This updates the underlying Coursier from 2.0.12 to 2.0.15 https://github.com/coursier/coursier/releases/tag/v2.0.13 - NumberFormatException fix https://github.com/coursier/coursier/releases/tag/v2.0.15 - Updates directories-jvm to 24 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 881c31d32..83ae963ca 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -77,7 +77,7 @@ object Dependencies { def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompileJVM2_12", zincCompile) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCoreJVM2_12", zincCompileCore) - val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.7" + val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.8" def sjsonNew(n: String) = Def.setting("com.eed3si9n" %% n % "0.9.1") // contrabandSjsonNewVersion.value From d19b2faaa5bd0853e191d4cf05e01fb010c7156c Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 21 Mar 2021 18:11:01 -0400 Subject: [PATCH 2/2] Clear .sbt/scripted/ directory --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78f99da1c..ca77b2d48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,6 +68,7 @@ jobs: key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Build and test run: | + rm -rf "$HOME/.sbt/scripted/" || true case ${{ matrix.jobtype }} in 1) sbt -v "mimaReportBinaryIssues ; javafmtCheck ; Test / javafmtCheck; scalafmtCheckAll ; scalafmtSbtCheck; serverTestProj/scalafmtCheckAll; headerCheck ;test:headerCheck ;whitesourceOnPush ;test:compile; publishLocal; test; serverTestProj/test; doc; $UTIL_TESTS; ++$SCALA_213; $UTIL_TESTS" @@ -98,6 +99,7 @@ jobs: echo unknown jobtype exit 1 esac + rm -rf "$HOME/.sbt/scripted/" || true rm -rf "$HOME/.ivy2/local" || true rm -r $(find $HOME/.sbt/boot -name "*-SNAPSHOT") || true find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true