Skip to content

Update sbt to 1.6.1 #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -180,7 +180,7 @@ lazy val tests = project
.dependsOn(coreJvm, renderJvm)
.settings(
shared,
skip.in(publish) := true,
(publish / skip) := true,
plotlyPrefix,
fetchTestData,
libraryDependencies ++= Seq(
Expand All @@ -199,5 +199,5 @@ lazy val almond = project
)

crossScalaVersions := Nil
skip.in(publish) := true
(publish / skip) := true
disablePlugins(MimaPlugin)
8 changes: 4 additions & 4 deletions project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.9
sbt.version=1.6.1