From e55955d918ac0269a461e1cc7c7c78d40cc65c41 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 10 Nov 2022 11:01:32 -0500 Subject: [PATCH 1/2] lm-coursier-shaded 2.0.13 --- project/Dependencies.scala | 4 ++-- .../conflict-manager-with-org/{test => pending} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename sbt-app/src/sbt-test/dependency-management/conflict-manager-with-org/{test => pending} (100%) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ceb44a859..a06f57624 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version") // sbt modules - private val ioVersion = nightlyVersion.getOrElse("1.7.0") + private val ioVersion = nightlyVersion.getOrElse("1.8.0") private val lmVersion = sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.7.1") val zincVersion = nightlyVersion.getOrElse("1.7.2") @@ -77,7 +77,7 @@ object Dependencies { def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompile", zincCompile) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore) - val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.12" + val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.13" def sjsonNew(n: String) = Def.setting("com.eed3si9n" %% n % "0.9.1") // contrabandSjsonNewVersion.value diff --git a/sbt-app/src/sbt-test/dependency-management/conflict-manager-with-org/test b/sbt-app/src/sbt-test/dependency-management/conflict-manager-with-org/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/conflict-manager-with-org/test rename to sbt-app/src/sbt-test/dependency-management/conflict-manager-with-org/pending From 03e1b3cadcad4189aeb01d3934b6a869da3bb6df Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 10 Nov 2022 12:02:37 -0500 Subject: [PATCH 2/2] Wipe out boot directory --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f45e1f38..6c2cc30a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,6 +105,7 @@ jobs: if: ${{ matrix.jobtype == 1 }} shell: bash run: | + rm -rf "$HOME/.sbt/boot/" || true ./sbt -v --client mimaReportBinaryIssues ./sbt -v --client javafmtCheck ./sbt -v --client "Test/javafmtCheck"