Skip to content

Update sbt to 1.7.1 #341

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Aug 11, 2022
Merged

Update sbt to 1.7.1 #341

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99f665a
Applied Scalafix rule(s) https://gist.githubusercontent.com/eed3si9n/…
scala-steward Jul 13, 2022
4cf88c7
Update sbt to 1.7.1
scala-steward Jul 13, 2022
43428bb
Merge branch 'master' into update/sbt-1.7.1
alexarchambault Aug 11, 2022
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
Next Next commit
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
  • Loading branch information
@scala-steward
scala-steward committed Jul 13, 2022
commit 99f665a7772b8dc5ae1b0f82f46e59a81e68fbf5
14 changes: 7 additions & 7 deletions build.sbt
View file
Open in desktop
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
View file
Open in desktop
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