Skip to content

Commit

Permalink
Upgrade stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
japgolly committed May 18, 2021
1 parent 42849fa commit fd3dc0c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: scala
scala:
- 2.12.13
- 2.13.5
- 3.0.0-RC3
- 3.0.0

jdk:
- openjdk8
Expand Down
2 changes: 1 addition & 1 deletion doc/changelog/0.10.0.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 0.10.0

* Add support for Scala 3.0.0-RC3
* Add support for Scala 3.0.0

* Drop support for Scala.JS 0.6

Expand Down
18 changes: 10 additions & 8 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ object NyayaBuild {

object Ver {
val BetterMonadicFor = "0.3.1"
val KindProjector = "0.11.3"
val KindProjector = "0.13.0"
val Monocle = "1.6.3"
val MTest = "0.7.9"
val MTest = "0.7.10"
val Scala212 = "2.12.13"
val Scala213 = "2.13.5"
val Scala3 = "3.0.0-RC3"
val ScalaCollCompat = "2.4.3"
val Scala3 = "3.0.0"
val ScalaCollCompat = "2.4.4"
val Scalaz = "7.2.31"
}

Expand Down Expand Up @@ -63,7 +63,7 @@ object NyayaBuild {
organization := "com.github.japgolly.nyaya",
homepage := Some(url("https://github.com/japgolly/" + ghProject)),
licenses += ("LGPL v2.1+" -> url("http://www.gnu.org/licenses/lgpl-2.1.txt")),
scalaVersion := Ver.Scala213,
scalaVersion := Ver.Scala3,
crossScalaVersions := Seq(Ver.Scala212, Ver.Scala213, Ver.Scala3),
testFrameworks := Nil,
ThisBuild / shellPrompt := ((s: State) => Project.extract(s).currentRef.project + "> "),
Expand Down Expand Up @@ -102,7 +102,11 @@ object NyayaBuild {
libraryDependencies ++= Seq(
Dep.BetterMonadicFor,
Dep.KindProjector
).filter(_ => isScala2.value)
).filter(_ => isScala2.value),

// Why?
Compile / unmanagedSourceDirectories := (Compile / unmanagedSourceDirectories).value.distinct,
Test / unmanagedSourceDirectories := (Test / unmanagedSourceDirectories).value.distinct,
)
)

Expand All @@ -120,7 +124,6 @@ object NyayaBuild {
val root = (Compile / baseDirectory).value / ".."
val shared = root / "shared" / "src" / "main"
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq(shared / "scala-3")
case Some((2, _)) => Seq(shared / "scala-2")
case _ => Nil
}
Expand All @@ -129,7 +132,6 @@ object NyayaBuild {
val root = (Test / baseDirectory).value / ".."
val shared = root / "shared" / "src" / "test"
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq(shared / "scala-3")
case Some((2, _)) => Seq(shared / "scala-2")
case _ => Nil
}
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.5.0
sbt.version=1.5.2
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.2")

libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"

0 comments on commit fd3dc0c

Please sign in to comment.