post review cleanup

Author: lrytz

admin/build.sh

@@ -17,9 +17,7 @@ set -ex
 #    - `update-api` to update the scaladoc api symlinks
 #    In all of the above modes, the `version` needs to be specified.
 #
-# before_install:
-#   - export version=2.12.4
-#   - export mode=archives
+# before_install: export version=2.12.N mode=release
 
 
 # Encryping files (if you need to encrypt a new file but no longer have the secret, create a new

build.sbt

@@ -20,22 +20,13 @@ mappings in upload := Seq()
 
 upload := {
   import com.amazonaws.{ClientConfiguration, Protocol}
-  import com.amazonaws.auth.{BasicAWSCredentials, AWSStaticCredentialsProvider, DefaultAWSCredentialsProviderChain}
+  import com.amazonaws.auth.DefaultAWSCredentialsProviderChain
   import com.amazonaws.services.s3.AmazonS3ClientBuilder
   import com.amazonaws.services.s3.model.PutObjectRequest
   import com.amazonaws.regions.Regions
 
-  def env(v: String) = {
-    val r = System.getenv(v)
-    assert(r != null, s"Credentials env not specified: $v")
-    r
-  }
-
-  val awsCreds = new BasicAWSCredentials(env("AWS_ACCESS_KEY_ID"), env("AWS_SECRET_ACCESS_KEY"))
-  val client = AmazonS3ClientBuilder.standard
-    .withCredentials(new AWSStaticCredentialsProvider(awsCreds))
-    .withRegion(Regions.US_EAST_1)
-    .build
+  // The standard client picks credentials from AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY env vars
+  val client = AmazonS3ClientBuilder.standard.withRegion(Regions.US_EAST_1).build
 
   val log = streams.value.log