Skip to content

Commit

Permalink
Merge pull request #65 from alexarchambault/topic/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
alexarchambault committed May 14, 2016
2 parents d1c385f + 609ebc7 commit 24da6af
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: scala
scala:
- 2.11.7
- 2.11.8
- 2.10.6
jdk:
- oraclejdk8
before_install:
- pip install --user codecov
after_success:
- codecov
script: mv version.sbt version.sbt0 && sed "s/-SNAPSHOT/-travis-SNAPSHOT/" < version.sbt0 > version.sbt && sbt ++${TRAVIS_SCALA_VERSION} coverage $(if [[ "${TRAVIS_SCALA_VERSION}" == "2.10.6" ]]; then echo test; else echo validate; fi) coverageReport $(if [[ "$TRAVIS_PULL_REQUEST" == "false"
script: mv version.sbt version.sbt0 && sed "s/-SNAPSHOT/-travis-SNAPSHOT/" < version.sbt0 > version.sbt && sbt -batch ++${TRAVIS_SCALA_VERSION} coverage $(if [[ "${TRAVIS_SCALA_VERSION}" == "2.10.6" ]]; then echo test; else echo validate; fi) coverageReport $(if [[ "$TRAVIS_PULL_REQUEST" == "false"
&& ${JAVA_HOME} == $(jdk_switcher home oraclejdk8) && "${TRAVIS_BRANCH}" == "master"
]]; then echo "publish"; fi)
sudo: false
Expand Down
19 changes: 10 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,16 @@ lazy val doc = project

lazy val coreName = "argonaut-shapeless_6.1"

val shapelessCompatVersion = "1.0.0-M4"

lazy val coreSettings = Seq(
organization := "com.github.alexarchambault",
name := coreName,
moduleName := coreName,
libraryDependencies ++= Seq(
"io.argonaut" %% "argonaut" % "6.1",
"com.chuusai" %% "shapeless" % "2.2.5",
"com.github.alexarchambault" %% "shapeless-compat" % "1.0.0-M1"
"com.github.alexarchambault" %% "shapeless-compat" % shapelessCompatVersion
)
)

Expand All @@ -50,8 +52,8 @@ lazy val refinedSettings = Seq(
libraryDependencies ++= Seq(
"io.argonaut" %% "argonaut" % "6.1",
"com.chuusai" %% "shapeless" % "2.2.5",
"com.github.alexarchambault" %% "shapeless-compat" % "1.0.0-M1",
"eu.timepit" %% "refined" % "0.3.3"
"com.github.alexarchambault" %% "shapeless-compat" % shapelessCompatVersion,
"eu.timepit" %% "refined" % "0.4.0"
)
)

Expand All @@ -62,8 +64,7 @@ lazy val projectSettings =
extraReleaseSettings

lazy val compileSettings = Seq(
scalaVersion := "2.11.7",
crossScalaVersions := Seq("2.10.6", "2.11.7"),
scalaVersion := "2.11.8",
scalacOptions += "-target:jvm-1.7",
resolvers ++= Seq(
Resolver.sonatypeRepo("releases")
Expand All @@ -79,7 +80,7 @@ lazy val compileSettings = Seq(

lazy val testSettings = Seq(
libraryDependencies ++= Seq(
"com.github.alexarchambault" %% "scalacheck-shapeless_1.13" % "1.0.0-RC1" % "test",
"com.github.alexarchambault" %% "scalacheck-shapeless_1.13" % "1.0.0-RC3" % "test",
"com.lihaoyi" %% "utest" % "0.3.0" % "test"
),
testFrameworks += new TestFramework("utest.runner.Framework")
Expand Down Expand Up @@ -110,12 +111,12 @@ lazy val commonSettings = Seq(
else
Some("releases" at nexus + "service/local/staging/deploy/maven2")
},
credentials += {
credentials ++= {
Seq("SONATYPE_USER", "SONATYPE_PASS").map(sys.env.get) match {
case Seq(Some(user), Some(pass)) =>
Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", user, pass)
Seq(Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", user, pass))
case _ =>
Credentials(Path.userHome / ".ivy2" / ".credentials")
Seq.empty
}
}
)
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.3")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M11")

0 comments on commit 24da6af

Please sign in to comment.