diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..3078035 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,29 @@ +after_success: + - | + if [ -n "$TRAVIS_TAG" ]; then + mkdir ~/.pgp + echo $PGP_PUBLIC | base64 --decode > ~/.pgp/pubring + echo $PGP_SECRET | base64 --decode > ~/.pgp/secring + sbt ++$TRAVIS_SCALA_VERSION publishSigned + elif [ "$TRAVIS_PULL_REQUEST" == false ] && [ "$TRAVIS_BRANCH" == master ]; then + mkdir ~/.pgp + echo $PGP_PUBLIC | base64 --decode > ~/.pgp/pubring + echo $PGP_SECRET | base64 --decode > ~/.pgp/secring + sbt ++$TRAVIS_SCALA_VERSION publishSigned + fi +deploy: + api_key: $GITHUB_AUTH + file: target/**/*.jar + file_glob: true + on: + tags: true + provider: releases + skip_cleanup: true +jdk: + - openjdk6 +language: scala +scala: + - 2.10.5 + - 2.11.6 +script: + - sbt ++$TRAVIS_SCALA_VERSION test package diff --git a/README.md b/README.md index 4ad1c53..a16af2f 100644 --- a/README.md +++ b/README.md @@ -38,3 +38,5 @@ resolvers += "Sonatype release repository" at "https://oss.sonatype.org/content/ ``` [Continue to Documentation](https://github.com/lucidsoftware/relate/wiki) + +[![Build Status](https://travis-ci.org/lucidsoftware/relate.svg)](https://travis-ci.org/lucidsoftware/relate) diff --git a/build.sbt b/build.sbt index 865ccd9..4ab4ce7 100644 --- a/build.sbt +++ b/build.sbt @@ -20,6 +20,12 @@ libraryDependencies ++= Seq( "mysql" % "mysql-connector-java" % "5.1.23" % "it" ) +pgpPassphrase := Some(Array()) + +pgpPublicRing := file(System.getProperty("user.home")) / ".pgp" / "pubring" + +pgpSecretRing := file(System.getProperty("user.home")) / ".pgp" / "secring" + pomExtra := ( https://github.com/lucidsoftware/relate @@ -50,10 +56,6 @@ pomExtra := ( pomIncludeRepository := { _ => false } -useGpg := true - -pgpReadOnly := false - publishMavenStyle := true credentials += Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", System.getenv("SONATYPE_USERNAME"), System.getenv("SONATYPE_PASSWORD")) diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 0000000..748703f --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 6879e5c..9ad43d9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1,3 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.2") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") + +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.5.0") diff --git a/src/test/scala/SqlResultSpec.scala b/src/test/scala/SqlResultSpec.scala index dd795ae..7372c57 100644 --- a/src/test/scala/SqlResultSpec.scala +++ b/src/test/scala/SqlResultSpec.scala @@ -224,7 +224,7 @@ class SqlResultSpec extends Specification with Mockito { rs.getObject("id") returns "1" thenReturns "2" thenReturns "1" thenReturns "2" rs.getObject("name") returns "one" thenReturns "two" thenReturns "three" thenReturns "four" - val res = result.asMultiMap[String, String] { row => + val res = result.asMultiMap { row => row.string("id") -> row.string("name") } res.keys must containTheSameElementsAs(Seq("1", "2"))