Skip to content

Commit

Permalink
Change default Scala version to 2.12.6 (closes #89)
Browse files Browse the repository at this point in the history
  • Loading branch information
dorsev authored and BenFradet committed Oct 8, 2018
1 parent 864a79a commit 4ef24c5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: scala
scala:
- 2.11.12
- 2.12.5
- 2.12.6
jdk:
- oraclejdk8
script:
Expand All @@ -11,7 +11,7 @@ deploy:
provider: script
script: "./.travis/deploy.sh $TRAVIS_TAG"
on:
condition: '"${TRAVIS_SCALA_VERSION}" == "2.12.5"'
condition: '"${TRAVIS_SCALA_VERSION}" == "2.12.6"'
tags: true
after_success:
- bash <(curl -s https://codecov.io/bash)
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ lazy val root = project
name := "scala-maxmind-iplookups",
version := "0.5.0",
description := "Scala wrapper for MaxMind GeoIP2 library",
scalaVersion := "2.11.12",
crossScalaVersions := Seq("2.11.12", "2.12.5"),
scalaVersion := "2.12.6",
crossScalaVersions := Seq("2.11.12", "2.12.6"),
scalacOptions := BuildSettings.compilerOptions,
javacOptions := BuildSettings.javaCompilerOptions,
scalafmtOnCompile := true
Expand Down

0 comments on commit 4ef24c5

Please sign in to comment.