Skip to content
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

upgrade scala to 2.13.1 #148

Merged
merged 26 commits into from
Nov 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6ea9a05
upgrade scala to 2.13.1
sirocchj Sep 18, 2019
52a30c9
Merge branch 'master' into 2.13.1
barambani Sep 21, 2019
7f61595
Merge branch 'master' into 2.13.1
sirocchj Sep 21, 2019
f2678e7
Merge branch 'master' into 2.13.1
sirocchj Sep 22, 2019
76cf8c6
expect kind-projector 0.10.4 to be published against full Scala version
sirocchj Sep 23, 2019
00d1bd7
merged w/ master
sirocchj Sep 23, 2019
a71c56b
Merge branch '2.13.1' of github.com:sirocchj/laserdisc into 2.13.1
sirocchj Sep 24, 2019
db121d6
merged w/ master
sirocchj Sep 24, 2019
fd36164
Merge branch 'master' into 2.13.1
sirocchj Sep 26, 2019
38e571a
Merge branch 'master' into 2.13.1
sirocchj Oct 2, 2019
b9e6fbe
bump kind-projector to 0.11.0
sirocchj Oct 3, 2019
85fa58b
Merge branch 'master' into 2.13.1
sirocchj Oct 5, 2019
ddb5c79
Merge branch 'master' into 2.13.1
sirocchj Oct 8, 2019
b0a9543
Merge branch 'master' into 2.13.1
sirocchj Oct 12, 2019
4babc46
Merge branch 'master' into 2.13.1
sirocchj Oct 14, 2019
b887ebf
Merge branch 'master' into 2.13.1
sirocchj Oct 14, 2019
86ad278
Merge branch 'master' into 2.13.1
sirocchj Oct 17, 2019
297dc2b
Merge branch 'master' into 2.13.1
sirocchj Oct 19, 2019
600df5f
Merge branch 'master' into 2.13.1
sirocchj Oct 21, 2019
818a4bd
Merge branch 'master' into 2.13.1
barambani Oct 26, 2019
5063cbc
Merge branch 'master' into 2.13.1
barambani Oct 27, 2019
9be3523
Merge branch 'master' into 2.13.1
sirocchj Nov 2, 2019
1d94110
Merge branch 'master' into 2.13.1
barambani Nov 9, 2019
1445a1b
Merge branch 'master' into 2.13.1
sirocchj Nov 10, 2019
af19258
Merge branch 'master' into 2.13.1
sirocchj Nov 20, 2019
a12c034
Update sbt-scoverage to 1.6.1
sirocchj Nov 20, 2019
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ sudo: false
language: scala
scala:
- 2.12.10
- 2.13.0
- 2.13.1

jdk:
- openjdk8
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

val `scala 2.12` = "2.12.10"
val `scala 2.13` = "2.13.0"
val `scala 2.13` = "2.13.1"

val V = new {
val circe = "0.12.3"
val fs2 = "2.1.0"
val `kind-projector` = "0.10.3"
val `kind-projector` = "0.11.0"
val kittens = "2.0.0"
val `log-effect-fs2` = "0.12.0"
val `parallel-collections` = "0.2.0"
Expand Down Expand Up @@ -46,7 +46,7 @@ val `scala-parallel-collections` = Def.setting {
}

val `kind-projector-compiler-plugin` = Def.setting {
compilerPlugin("org.typelevel" % "kind-projector" % V.`kind-projector` cross CrossVersion.binary)
compilerPlugin("org.typelevel" % "kind-projector" % V.`kind-projector` cross CrossVersion.full)
}

val coreDeps = Def.Initialize.join {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.6.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")