Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Update Cats Version and Other Compatible Shifts #204

Merged
merged 6 commits into from
Oct 4, 2017
Merged

Update Cats Version and Other Compatible Shifts #204

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9aa6983
Update Cats Version and Other Compatible Shifts
ChristopherDavenport Sep 19, 2017
0817bdd
Update Travis Scala Versions
ChristopherDavenport Sep 19, 2017
b1d7d76
Update Scala 2.12 and Scala-Js Version
ChristopherDavenport Sep 19, 2017
479d84e
Fix Travis 2.12 and Gitignore Intellij
ChristopherDavenport Sep 19, 2017
4b3462c
Switch from DomNode to NodeJS jsEnv
ChristopherDavenport Sep 19, 2017
bc9786a
Remove Bad Implicits from 2.12
ChristopherDavenport Sep 19, 2017
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: false
language: scala

scala:
- 2.11.8
- 2.11.11
- 2.10.6

env:
Expand All @@ -14,7 +14,7 @@ jdk:

matrix:
include:
- scala: 2.12.0
- scala: 2.12.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not bump to 2.12.3?

jdk: oraclejdk8
env: DEPLOY=true

Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
lazy val scalaCheckVersion = "1.13.4"
lazy val scalaTestVersion = "3.0.1"
lazy val disciplineVersion = "0.7.2"
lazy val catsVersion = "0.9.0"
lazy val catsVersion = "1.0.0-MF"
lazy val catalystsVersion = "0.0.5"

lazy val buildSettings = Seq(
organization := "org.typelevel",
scalaVersion := "2.12.1",
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1")
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.1")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we change to 2.12.3 here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the dilemma is that these require scala-js changes which require changes to your build.sbt.

I didn't want to do that on the original PR in case you wanted to have a minimal dependency shift, however I can get these done.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently so did, 2.11.11 so it needed to be done either way.

)

lazy val commonSettings = Seq(
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=0.13.13
sbt.version=0.13.16