Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
Use hyperion-7RC1 in prep for scala 2.13 update (#66)
Browse files Browse the repository at this point in the history
  • Loading branch information
realstraw authored Oct 27, 2020
1 parent 4d98461 commit 53ccdf2
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 19 deletions.
8 changes: 5 additions & 3 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 2.6.3
version = 2.7.0

// Line Length
maxColumn = 100 // Line length 100 characters, please note that long string won't be broken up into new lines
Expand All @@ -9,11 +9,13 @@ continuationIndent.defnSite = 2
docstrings = JavaDoc

// No need to always do new lines after message definitions
newlines.alwaysBeforeMultilineDef = false
newlines.beforeMultilineDef = keep

// No align on case matches
align.preset=none
align.preset = none

rewrite.rules = [SortImports]

binPack.parentConstructors = Always

project.excludeFilters = [".*\\.sbt$"]
20 changes: 8 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
val awsSdkVersion = "1.11.848"
val slickVersion = "3.3.2"
val akkaVersion = "2.6.8"
val awsSdkVersion = "1.11.887"
val slickVersion = "3.3.3"
val akkaVersion = "2.6.10"

val scalaTestArtifact = "org.scalatest" %% "scalatest" % "3.2.2" % Test
val slickArtifact = "com.typesafe.slick" %% "slick" % slickVersion
val slickHikaricpArtifact = "com.typesafe.slick" %% "slick-hikaricp" % slickVersion
val scoptArtifact = "com.github.scopt" %% "scopt" % "3.7.1"
val configArtifact = "com.typesafe" % "config" % "1.4.0"
val configArtifact = "com.typesafe" % "config" % "1.4.1"
val nscalaTimeArtifact = "com.github.nscala-time" %% "nscala-time" % "2.24.0"
val hyperionArtifact = "com.krux" %% "hyperion" % "6.0.0"
val hyperionArtifact = "com.krux" %% "hyperion" % "7.0.0-RC1"
val slf4jApiArtifact = "org.slf4j" % "slf4j-api" % "1.7.30"
val logbackClassicArtifact = "ch.qos.logback" % "logback-classic" % "1.2.3"
val awsSdkS3 = "com.amazonaws" % "aws-java-sdk-s3" % awsSdkVersion
val awsSdkSES = "com.amazonaws" % "aws-java-sdk-ses" % awsSdkVersion
val awsSdkSSM = "com.amazonaws" % "aws-java-sdk-ssm" % awsSdkVersion
val awsSdkSNS = "com.amazonaws" % "aws-java-sdk-sns" % awsSdkVersion
val awsSdkCloudWatch = "com.amazonaws" % "aws-java-sdk-cloudwatch" % awsSdkVersion
val stubbornArtifact = "com.krux" %% "stubborn" % "1.4.1"
val metricsGraphite = "io.dropwizard.metrics" % "metrics-graphite" % "4.1.12.1"
val postgreSqlJdbc = "org.postgresql" % "postgresql" % "42.2.16"
val awsLambdaEvents = "com.amazonaws" % "aws-lambda-java-events" % "3.2.0"
val metricsGraphite = "io.dropwizard.metrics" % "metrics-graphite" % "4.1.14"
val postgreSqlJdbc = "org.postgresql" % "postgresql" % "42.2.18"
val awsLambdaEvents = "com.amazonaws" % "aws-lambda-java-events" % "3.4.0"
val awsLambdaCore = "com.amazonaws" % "aws-lambda-java-core" % "1.2.1"
val akkaActorArtifact = "com.typesafe.akka" %% "akka-actor-typed" % akkaVersion

Expand Down Expand Up @@ -60,7 +59,6 @@ lazy val core = (project in file("starport-core")).
awsSdkSSM,
awsSdkSNS,
awsSdkCloudWatch,
stubbornArtifact,
metricsGraphite,
postgreSqlJdbc,
akkaActorArtifact
Expand All @@ -72,8 +70,6 @@ lazy val lambda = (project in file("starport-lambda")).
settings(commonSettings: _*).
settings(
name := "starport-lambda",
buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
buildInfoPackage := "com.krux.starport",
assemblyJarName in assembly := "starport-lambda.jar",
libraryDependencies ++= Seq(
awsLambdaCore,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.13
sbt.version=1.4.0
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "7.2.0"
version in ThisBuild := "7.3.0"

0 comments on commit 53ccdf2

Please sign in to comment.