Skip to content
This repository has been archived by the owner on Nov 24, 2021. It is now read-only.

Commit

Permalink
Fix build for Scala 2.12
Browse files Browse the repository at this point in the history
Scala 2.10.6 is the only version we now support that still
supports/requires JVM 1.7, so this is now exclusively a special-case.
  • Loading branch information
nicktelford committed May 11, 2017
1 parent 7061ce7 commit 3291a50
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package com.datasift.dropwizard.scala.jdbi.tweak
import java.sql.{Types, PreparedStatement}

import org.scalatest.FlatSpec
import org.scalatest.mock.MockitoSugar
import org.scalatest.mockito.MockitoSugar
import org.skife.jdbi.v2.StatementContext
import org.mockito.Mockito._
import org.mockito.Matchers.{eq => equalTo}
import org.mockito.ArgumentMatchers.{eq => equalTo}

class BigDecimalArgumentFactorySpec extends FlatSpec with MockitoSugar {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class MetricImplicitsSpec extends FlatSpec {
"Gauge" should "be transformable by another function" in {
val registry = new MetricRegistry
val gauge = registry.gauge("test.gauge")(50)
val transformed = gauge.map(2*)
val transformed = gauge.map(2 * _)
assert(gauge.getValue === 50)
assert(transformed.getValue === 100)
}
Expand Down
8 changes: 1 addition & 7 deletions project/Project.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@ object CompileOptions {
"-language:implicitConversions" ::
"-language:higherKinds" ::
"-feature" ::
(scalaVersion match {
case v if v.startsWith("2.11.") && v.stripPrefix("2.11.").toInt > 4 =>
"-target:jvm-1.8"
case _ =>
"-target:jvm-1.7"
}) ::
Nil
(if (scalaVersion.startsWith("2.10.")) "-target:jvm-1.7" :: Nil else Nil)

val java: Seq[String] = Seq("-source", "1.8", "-target", "1.8")
}
Expand Down

0 comments on commit 3291a50

Please sign in to comment.