Skip to content

Commit

Permalink
bump native packager over to github
Browse files Browse the repository at this point in the history
  • Loading branch information
kenoir committed Sep 19, 2024
1 parent 955a62d commit 0451650
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 18 deletions.
12 changes: 0 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import java.io.File
import java.util.UUID

import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider

def setupProject(
project: Project,
folder: String,
Expand Down Expand Up @@ -195,13 +193,3 @@ lazy val ingests_indexer = setupProject(
localDependencies = Seq(display, indexer_common),
description = "Indexes information about ingests in an Elasticsearch cluster"
)

// AWS Credentials to read from S3

s3CredentialsProvider := { _ =>
val builder = new STSAssumeRoleSessionCredentialsProvider.Builder(
"arn:aws:iam::760097843905:role/terraform-20210811133135108800000001",
UUID.randomUUID().toString
)
builder.build()
}
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sbt._

object WellcomeDependencies {
val defaultVersion = "32.42.0" // This is automatically bumped by the scala-libs release process, do not edit this line manually
val defaultVersion = "32.42.1" // This is automatically bumped by the scala-libs release process, do not edit this line manually

lazy val versions = new {
val fixtures = defaultVersion
Expand Down Expand Up @@ -80,8 +80,8 @@ object WellcomeDependencies {
)

private def library(name: String, version: String): Seq[ModuleID] = Seq(
"weco" %% name % version,
"weco" %% name % version % "test" classifier "tests"
"org.wellcomecollection" %% name % version,
"org.wellcomecollection" %% name % version % "test" classifier "tests"
)
}

Expand Down
5 changes: 2 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.35")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.6")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16")
addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.22.0")
addDependencyTreePlugin
addDependencyTreePlugin

0 comments on commit 0451650

Please sign in to comment.