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

Update dependencies #269

Merged
merged 4 commits into from
Aug 7, 2018
Merged

Update dependencies #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae92f85
Upgrade dependency versions
jrudolph Jul 10, 2018
6ec17cb
Build with 2.12 by default
jrudolph Jul 10, 2018
cf83a40
Cleanup build
jrudolph Jul 26, 2018
d2f0f99
Remove 2.13.0-M3 support for now
jrudolph Jul 26, 2018
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
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ scala:
- 2.10.7
- 2.11.12
- 2.12.6
- 2.13.0-M3
script:
- sbt "++ ${TRAVIS_SCALA_VERSION}!" test mimaReportBinaryIssues
jdk:
Expand Down
26 changes: 4 additions & 22 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,20 @@ startYear := Some(2011)

licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))

scalaVersion := "2.11.12"

scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-Xlint", "-encoding", "utf8")

resolvers += Opts.resolver.sonatypeReleases

libraryDependencies ++=
(CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, n)) if n >= 13 =>
Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "0.1.2")
case _ =>
Nil
})

libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 10)) => Seq(
"org.specs2" %% "specs2-core" % "3.8.9" % "test",
"org.specs2" %% "specs2-scalacheck" % "3.8.9" % "test",
"org.scalacheck" %% "scalacheck" % "1.13.4" % "test"
)
case Some((2, n)) if n >= 11 => Seq(
"org.specs2" %% "specs2-core" % "4.0.2" % "test",
"org.specs2" %% "specs2-scalacheck" % "4.0.2" % "test",
"org.scalacheck" %% "scalacheck" % "1.13.5" % "test"
"org.specs2" %% "specs2-core" % "4.3.2" % "test",
"org.specs2" %% "specs2-scalacheck" % "4.3.2" % "test",
"org.scalacheck" %% "scalacheck" % "1.14.0" % "test"
)
case _ => Nil
})
Expand Down Expand Up @@ -77,15 +67,7 @@ mimaBinaryIssueFilters := Seq(
// publishing
///////////////

crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M3")

scalaBinaryVersion := {
val sV = scalaVersion.value
if (CrossVersion.isScalaApiCompatible(sV))
CrossVersion.binaryScalaVersion(sV)
else
sV
}
crossScalaVersions := Seq("2.12.6", "2.10.7", "2.11.12")

publishMavenStyle := true

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=1.1.6
sbt.version=1.2.0
6 changes: 3 additions & 3 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")

addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")