Skip to content

GitHub Actions + dependency upgrades for 3.1.x #29

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

Merged
merged 5 commits into from
Aug 27, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
Dependency upgrades
  • Loading branch information
ddworak committed Aug 26, 2021
commit 588df79e92319e358379a3a18c0f13b66f597de9
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ buildNumber.properties
## Plugin-specific files:

# IntelliJ
/out/
out/

# mpeltonen/sbt-idea plugin
.idea_modules/
Expand Down Expand Up @@ -117,6 +117,7 @@ hs_err_pid*
.cache
.history
.lib/
.bsp/
dist/*
target/
lib_managed/
Expand Down
17 changes: 8 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ inThisBuild(Seq(
))

val commonSettings = Seq(
scalaVersion := "2.13.1",
crossScalaVersions := Seq("2.12.11", "2.13.1"),
scalaVersion := "2.13.6",
crossScalaVersions := Seq("2.13.6", "2.12.14"),
scalacOptions ++= Seq(
"-feature",
"-deprecation",
Expand All @@ -19,15 +19,14 @@ val commonSettings = Seq(
"-language:postfixOps",
"-language:experimental.macros",
"-Xfatal-warnings",
"-Xlint:_",
"-Ywarn-unused:_,-explicits,-implicits",
"-Ybackend-parallelism", "4",
"-Xlint:_,-missing-interpolator,-unused",
"-Yrangepos",
"-Ybackend-parallelism", "8",
"-Ycache-plugin-class-loader:last-modified",
"-Ycache-macro-class-loader:last-modified",
),
autoAPIMappings := true,
publishMavenStyle := true,
publishArtifact in Test := false,
pomIncludeRepository := { _ => false },

publishTo := sonatypePublishToBundle.value,
Expand Down Expand Up @@ -80,9 +79,9 @@ lazy val root = project.in(file("."))
commonJSSettings,

libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "0.9.8",
"org.scalatest" %%% "scalatest" % "3.1.1" % Test,
"com.lihaoyi" %%% "scalatags" % "0.8.6" % Test
"org.scala-js" %%% "scalajs-dom" % "1.2.0",
"org.scalatest" %%% "scalatest" % "3.2.9" % Test,
"com.lihaoyi" %%% "scalatags" % "0.9.4" % Test
),

Compile / npmDependencies += "jquery" -> "3.4.1",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# suppress inspection "UnusedProperty"
sbt.version=1.3.9
sbt.version=1.5.5
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
logLevel := Level.Warn

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.17.0")
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")

// Deployment configuration
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")