A few changes to accommodate to sbt-pgp 2.x

julienrf · Oct 18, 2019 · fbea7f8 · fbea7f8
1 parent 8dc1106
commit fbea7f8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -52,6 +52,7 @@ jobs:
       script:
         - openssl aes-256-cbc -K $encrypted_6d2e0e4487f6_key -iv $encrypted_6d2e0e4487f6_iv -in ci/secrets.tar.enc -out ci/secrets.tar -d
         - tar xvf ci/secrets.tar
+        - echo $PGP_PASSPHRASE | gpg --passphrase-fd 0 --batch --yes --import ci/secring.asc
         - chmod 600 ci/travis-key
         - eval "$(ssh-agent -s)"
         - ssh-add ci/travis-key

diff --git a/build.sbt b/build.sbt
@@ -19,9 +19,4 @@ noPublishSettings
 
 ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet
 
-inThisBuild(Seq(
-  pgpPublicRing := file("ci/pubring.asc"),
-  pgpSecretRing := file("ci/secring.asc")
-))
-
 publishTo in ThisBuild := sonatypePublishTo.value
diff --git a/project/EndpointsSettings.scala b/project/EndpointsSettings.scala
@@ -25,10 +25,6 @@ object EndpointsSettings {
       case _ => Seq("-Yno-adapted-args", "-Ywarn-unused-import", "-Xexperimental", "-Xfuture", "-Ywarn-value-discard")
     })
   )
-  val `scala 2.11` = Seq(
-    scalaVersion := "2.11.12",
-    crossScalaVersions := Seq("2.11.12")
-  )
   val `scala 2.12` = Seq(
     scalaVersion := "2.12.10",
     crossScalaVersions := Seq("2.12.10")