8000 Make series/2.x CI green again :green_circle: by sideeffffect · Pull Request #6331 · zio/zio · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Make series/2.x CI green again 🟢 #6331

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 5 commits into from
Feb 5, 2022
Merged

Make series/2.x CI green again 🟢 #6331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1bd1d2b
Updata sbt-scalafix to 0.9.34
sideeffffect Feb 5, 2022
db5cde6
Update build.sbt
sideeffffect Feb 5, 2022
bae6c48
Update build.sbt
sideeffffect Feb 5, 2022
7790743
Update versions
sideeffffect Feb 5, 2022
96d0acc
Update versions
sideeffffect Feb 5, 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
19 changes: 8 additions & 11 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ val catsEffectV = "3.2.9"
val zioActorsV = "0.0.9"

lazy val scalafixSettings = List(
scalaVersion := "2.13.7",
scalaVersion := Scala213,
addCompilerPlugin(scalafixSemanticdb),
crossScalaVersions --= List(Scala211, Scala212, Scala3),
scalacOptions ++= List(
Expand All @@ -663,7 +663,7 @@ lazy val scalafixRules = project.module
.settings(
scalafixSettings,
semanticdbEnabled := true, // enable SemanticDB
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % "0.9.32"
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % "0.9.34"
)

val zio1Version = "1.0.12"
Expand Down Expand Up @@ -691,7 +691,7 @@ lazy val scalafixTests = project
.settings(
scalafixSettings,
publish / skip := true,
libraryDependencies += "ch.epfl.scala" % "scalafix-testkit" % "0.9.32" % Test cross CrossVersion.full,
libraryDependencies += "ch.epfl.scala" % "scalafix-testkit" % "0.9.34" % Test cross CrossVersion.full,
Compile / compile :=
(Compile / compile).dependsOn(scalafixInput / Compile / compile).value,
scalafixTestkitOutputSourceDirectories :=
Expand Down Expand Up @@ -730,14 +730,11 @@ lazy val docs = project.module
docusaurusCreateSite := docusaurusCreateSite.dependsOn(Compile / unidoc).value,
docusaurusPublishGhpages := docusaurusPublishGhpages.dependsOn(Compile / unidoc).value,
libraryDependencies ++= Seq(
"commons-io" % "commons-io" % "2.11.0" % "provided",
"io.7mind.izumi" %% "distage-core" % "1.0.8",
"io.7mind.izumi" %% "logstage-core" % "1.0.8",
"org.jsoup" % "jsoup" % "1.14.3" % "provided",
"org.reactivestreams" % "reactive-streams-examples" % "1.0.3" % "provided",
/* to evict 1.3.0 brought in by mdoc-js */
"org.scala-js" % "scalajs-compiler" % scalaJSVersion cross CrossVersion.full,
"org.scala-js" %% "scalajs-linker" % scalaJSVersion,
"commons-io" % "commons-io" % "2.11.0" % "provided",
"io.7mind.izumi" %% "distage-core" % "1.0.8",
"io.7mind.izumi" %% "logstage-core" % "1.0.8",
"org.jsoup" % "jsoup" % "1.14.3" % "provided",
"org.reactivestreams" % "reactive-streams-examples" % "1.0.3" % "provided",
"org.typelevel" %% "cats-effect" % catsEffectV,
"dev.zio" %% "zio-actors" % zioActorsV,
"dev.zio" %% "zio-akka-cluster" % "0.2.0",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.1
sbt.version=1.6.2
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc"
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("pl.project13.scala" % "sbt-jcstress" % "0.2.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.32")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")

libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.3"
2 changes: 1 addition & 1 deletion scalafix/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.5
sbt.version=1.6.2
2 changes: 1 addition & 1 deletion scalafix/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.30")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
0