From 99f665a7772b8dc5ae1b0f82f46e59a81e68fbf5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 13 Jul 2022 12:54:03 +0000 Subject: [PATCH 1/2] Applied Scalafix rule(s) https://gist.githubusercontent.com/eed3si9n/57e83f5330592d968ce49f0d5030d4d5/raw/7f576f16a90e432baa49911c9a66204c354947bb/Sbt0_13BuildSyntax.scala See https://eed3si9n.com/syntactic-scalafix-rule-for-unified-slash-syntax for details --- build.sbt | 14 +++++++------- project/Settings.scala | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.sbt b/build.sbt index c08126f..da55e42 100644 --- a/build.sbt +++ b/build.sbt @@ -76,12 +76,12 @@ lazy val render = crossProject(JVMPlatform, JSPlatform) WebDeps.plotlyJs, Deps.scalaTest % "test" ), - resourceGenerators.in(Compile) += Def.task { + (Compile / resourceGenerators) += Def.task { import sys.process._ val log = state.value.log - val dir = classDirectory.in(Compile).value / "plotly" + val dir = (Compile / classDirectory).value / "plotly" val ver = version.value val f = dir / "plotly-scala.properties" @@ -133,10 +133,10 @@ lazy val demo = project .dependsOn(renderJs) .settings( shared, - skip.in(publish) := true, + (publish / skip) := true, plotlyPrefix, - test.in(Test) := {}, - testOnly.in(Test) := {}, + (Test / test) := {}, + (Test / testOnly) := {}, libraryDependencies += Deps.scalatags.value, jsDependencies ++= Seq( WebDeps.plotlyJs @@ -180,7 +180,7 @@ lazy val tests = project .dependsOn(coreJvm, renderJvm) .settings( shared, - skip.in(publish) := true, + (publish / skip) := true, plotlyPrefix, fetchTestData, libraryDependencies ++= Seq( @@ -199,5 +199,5 @@ lazy val almond = project ) crossScalaVersions := Nil -skip.in(publish) := true +(publish / skip) := true disablePlugins(MimaPlugin) diff --git a/project/Settings.scala b/project/Settings.scala index fa385fe..5a7a4e9 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -79,11 +79,11 @@ object Settings { } } - process(dir / "plotly", Vector(), scalaSource.in(Compile).value / "plotly" / "demo") + process(dir / "plotly", Vector(), (Compile / scalaSource).value / "plotly" / "demo") files }, - sourceGenerators.in(Compile) += customSourceGenerators.taskValue + (Compile / sourceGenerators) += customSourceGenerators.taskValue ) private val scala212 = "2.12.13" @@ -127,9 +127,9 @@ object Settings { lazy val fetchTestData = { - unmanagedResources.in(Test) ++= { + (Test / unmanagedResources) ++= { val log = streams.value.log - val baseDir = baseDirectory.in(LocalRootProject).value + val baseDir = (LocalRootProject / baseDirectory).value val testsPostsDir = baseDir / "plotly-documentation" / "_posts" if (!testsPostsDir.exists()) gitLock.synchronized { From 4cf88c731180503cc7898fc5b7c0f2827ea7c2c5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 13 Jul 2022 12:54:03 +0000 Subject: [PATCH 2/2] Update sbt to 1.7.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index dbae93b..22af262 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.7.1