Skip to content

Commit

Permalink
fix deprecated message and s3credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
tsuyoshizawa committed Oct 17, 2017
1 parent 4fc7f7c commit 78a1dbe
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/main/scala/SBTS3Resolver.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ object SbtS3Resolver extends AutoPlugin {
@deprecated("s3acl is now an Option. Please define it either Some(...) or None if you wish to inherit the bucket default.", "0.18.0")
implicit def acl2Option(acl: S3ACL): Option[S3ACL] = Some(acl)

@deprecated("awsProfile is now an Option. Please define it either Some(...) or None if you wish to inherit the bucket default.", "0.19.0")
@deprecated("awsProfile is now an Option. Please define it either Some(...).", "0.19.0")
implicit def awsProfile2Option(profile: String): Option[String] = Some(profile)

case class S3Resolver(
Expand Down Expand Up @@ -138,10 +138,7 @@ object SbtS3Resolver extends AutoPlugin {
s3credentials :=
(awsProfile.value match {
case Some(profile) => new ProfileCredentialsProvider(profile)
case _ =>
new ProfileCredentialsProvider() |
new EnvironmentVariableCredentialsProvider() |
InstanceProfileCredentialsProvider.getInstance()
case _ => new DefaultAWSCredentialsProviderChain()
}),
s3region := (awsProfile.value match {
case Some(profile) => new AwsProfileRegionProvider(profile)
Expand Down

0 comments on commit 78a1dbe

Please sign in to comment.