Merge pull request #120 from zsxwing/remove-gpg

Remove the GPG plugin because Bintray will sign files automatically
ReactiveX · Jan 22, 2015 · e2e6516 · e2e6516
2 parents 1326cf6 + bc0c46b
commit e2e6516
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/project/gpg.sbt b/project/gpg.sbt
diff --git a/publish.sbt b/publish.sbt
@@ -1,19 +1,13 @@
 import bintray.BintrayCredentials.api
 import bintray.Keys._
 
-pgpSecretRing := file("key.private.F984A085.asc")
-
-pgpPublicRing := file("key.public.F984A085.asc")
-
-pgpPassphrase := sys.env get "PGP_ENCRYPTION_PASSWORD" map (_ toCharArray)
-
 bintraySettings
 
 repository in bintray := "RxJava"
 
 name in bintray := "RxScala"
 
-licenses += ("The Apache Software License, Version 2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt"))
+licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt"))
 
 bintrayOrganization in bintray := Some("reactivex")
 

diff --git a/publishViaTravis.sh b/publishViaTravis.sh
@@ -5,16 +5,11 @@ echo -e 'Bintray Upload Script => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']
 
 if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
 
-  echo -e 'Bintray Upload => Decrypting keys ...\n'
-
-  openssl aes-256-cbc -K $encrypted_506de5234d8d_key -iv $encrypted_506de5234d8d_iv -in key.private.F984A085.asc.enc -out key.private.F984A085.asc -d
-  openssl aes-256-cbc -K $encrypted_506de5234d8d_key -iv $encrypted_506de5234d8d_iv -in key.public.F984A085.asc.enc -out key.public.F984A085.asc -d
-
   echo -e 'Bintray Upload => Starting upload ...\n'
 
   sbt storeBintrayCredentials
 
-  sbt +publishSigned
+  sbt +publish
   RETVAL=$?
 
   if [ $RETVAL -eq 0 ]; then