Skip to content

Commit

Permalink
Merge pull request #18 from hmrc/BDOG-871
Browse files Browse the repository at this point in the history
BDOG-871 add .coursier to travis config
  • Loading branch information
christopherjturner committed Jun 10, 2020
2 parents 7117781 + f9d7b61 commit 8f13643
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -5,7 +5,7 @@ cache:
directories:
- $HOME/.sbt
- $HOME/.ivy2
- $HOME/.m2
- $HOME/.coursier

jdk:
- openjdk8
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Expand Up @@ -6,17 +6,17 @@ val appName = "http-caching-client"

val compileDependencies = PlayCrossCompilation.dependencies(
play25 = Seq(
"uk.gov.hmrc" %% "json-encryption" % "4.7.0-play-25",
"uk.gov.hmrc" %% "json-encryption" % "4.8.0-play-25",
"com.typesafe.play" %% "play-json" % "2.5.19",
"uk.gov.hmrc" %% "http-verbs" % "10.7.0-play-25"
),
play26 = Seq(
"uk.gov.hmrc" %% "json-encryption" % "4.7.0-play-26",
"uk.gov.hmrc" %% "json-encryption" % "4.8.0-play-26",
"com.typesafe.play" %% "play-json" % "2.6.14",
"uk.gov.hmrc" %% "http-verbs" % "10.7.0-play-26"
),
play27 = Seq(
"uk.gov.hmrc" %% "json-encryption" % "4.7.0-play-27",
"uk.gov.hmrc" %% "json-encryption" % "4.8.0-play-27",
"com.typesafe.play" %% "play-json" % "2.7.4",
"uk.gov.hmrc" %% "http-verbs" % "10.7.0-play-27"
)
Expand All @@ -36,7 +36,7 @@ lazy val library = Project(appName, file("."))
majorVersion := 9,
makePublicallyAvailableOnBintray := true,
libraryDependencies ++= compileDependencies ++ testDependencies,
scalaVersion := "2.11.12",
scalaVersion := "2.12.8",
crossScalaVersions := Seq("2.11.12", "2.12.8"),
resolvers := Seq(
Resolver.bintrayRepo("hmrc", "releases"),
Expand Down
13 changes: 3 additions & 10 deletions project/PlayCrossCompilation.scala
@@ -1,11 +1,4 @@
import uk.gov.hmrc.playcrosscompilation.{AbstractPlayCrossCompilation, PlayVersion}
import uk.gov.hmrc.playcrosscompilation.PlayVersion.Play25
import uk.gov.hmrc.playcrosscompilation.AbstractPlayCrossCompilation
import uk.gov.hmrc.playcrosscompilation.PlayVersion.Play26

object PlayCrossCompilation extends AbstractPlayCrossCompilation(defaultPlayVersion = Play25){
override def playCrossScalaBuilds(scalaVersions: Seq[String]): Seq[String] =
playVersion match {
case PlayVersion.Play25 => scalaVersions.filter(version => version.startsWith("2.11"))
case PlayVersion.Play26 => scalaVersions
case PlayVersion.Play27 => scalaVersions.filter(version => version.startsWith("2.12"))
}
}
object PlayCrossCompilation extends AbstractPlayCrossCompilation(defaultPlayVersion = Play26)

0 comments on commit 8f13643

Please sign in to comment.