diff options
| author | Jakob Odersky <jakob@odersky.com> | 2019-06-15 17:30:26 +0200 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2019-06-15 17:30:26 +0200 |
| commit | 4a55232d23c47225dc1c12b530636595b4453ac5 (patch) | |
| tree | 71368e410c6efd4a6472c14dc8aa4f4eac036e54 | |
| parent | 0be325d533af3c5d4f9af70bce495da6047f6c3a (diff) | |
| download | sbt-jni-4a55232d23c47225dc1c12b530636595b4453ac5.tar.gz sbt-jni-4a55232d23c47225dc1c12b530636595b4453ac5.tar.bz2 sbt-jni-4a55232d23c47225dc1c12b530636595b4453ac5.zip | |
| -rwxr-xr-x | .travis/build | 19 | ||||
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | plugin/src/sbt-test/sbt-jni/simple/project/build.properties | 2 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 3 |
5 files changed, 14 insertions, 14 deletions
diff --git a/.travis/build b/.travis/build index 124f385..84838f8 100755 --- a/.travis/build +++ b/.travis/build @@ -17,19 +17,16 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then gpg --import sec.gpg # Setup sbt-pgp plugin - cat <<-EOF > project/gpg.sbt - addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") - EOF cat <<-EOF > gpg.sbt - pgpSigningKey in Global := Some(0x7C921C6769797655l) - useGpgAgent in Global := true - useGpg in Global := true + credentials += Credentials( + "GnuPG Key ID", + "gpg", + "2B50AAFF11989ECC8531EB4A7C921C6769797655", // key identifier + "ignored" // this field is ignored; passwords are supplied by pinentry + ) EOF - # Setup bitray publishing plugin - cat <<-EOF > project/bintray.sbt - addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4") - EOF + # Setup bintray publishing plugin mkdir ~/.bintray openssl aes-256-cbc \ -K "$encrypted_35cdae908c05_key" \ @@ -38,5 +35,5 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then -out ~/.bintray -d # Publish - sbt +publishSigned + sbt +publish fi @@ -50,9 +50,9 @@ lazy val macros = (project in file("macros")) ) lazy val plugin = (project in file("plugin")) + .enablePlugins(SbtPlugin) .settings( name := "sbt-jni", - sbtPlugin := true, publishMavenStyle := false, libraryDependencies += "org.ow2.asm" % "asm" % "6.0", // make project settings available to source diff --git a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties index d6e3507..c0bab04 100644 --- a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties +++ b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.6 +sbt.version=1.2.8 diff --git a/project/build.properties b/project/build.properties index d6e3507..c0bab04 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.6 +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 97fc739..ff05dad 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,5 @@ // testing for sbt plugins libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value + +addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0") +addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4") |