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.

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

Jump to bottom

Upgrade to scala-2.12.6, drop macro-compat #1816

Merged
merged 4 commits into from Apr 29, 2018
Merged

Upgrade to scala-2.12.6, drop macro-compat #1816

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0703edd
Upgrade to scala-2.12.6
rossabaker Apr 27, 2018
8f01859
Drop Macro Paradise and macro-compat dependencies
rossabaker Apr 28, 2018
022b49a
Back to auto-derivation to shed Macro Paradise
rossabaker Apr 28, 2018
88c679b
Fix typo in changelog
rossabaker Apr 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ environment:
TEST_SUITE: test
matrix:
- SCALA_VERSION: 2.11.12
- SCALA_VERSION: 2.12.4
- SCALA_VERSION: 2.12.6

install:
- ps: |
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -12,11 +12,11 @@ env:
matrix:
include:
- jdk: oraclejdk8
scala: 2.12.4
scala: 2.12.6
- jdk: oraclejdk8
scala: 2.11.12
- jdk: oraclejdk9
scala: 2.12.4
scala: 2.12.6
notifications:
webhooks:
urls:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/tut/service.md
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ and calling it with http4s' client.
Create a new directory, with the following build.sbt in the root:

```scala
scalaVersion := "2.12.4" // Also supports 2.11.x
scalaVersion := "2.12.6" // Also supports 2.11.x

val http4sVersion = "{{< version "http4s.doc" >}}"

Expand Down
2 changes: 1 addition & 1 deletion project/Http4sPlugin.scala
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@ object Http4sPlugin extends AutoPlugin {
) ++ signingSettings

override lazy val projectSettings: Seq[Setting[_]] = Seq(
scalaVersion := (sys.env.get("TRAVIS_SCALA_VERSION") orElse sys.env.get("SCALA_VERSION") getOrElse "2.12.4"),
scalaVersion := (sys.env.get("TRAVIS_SCALA_VERSION") orElse sys.env.get("SCALA_VERSION") getOrElse "2.12.6"),

// Rig will take care of this on production builds. We haven't fully
// implemented that machinery yet, so we're going to live without this
Expand Down