Updating packages, adding new configuration for KCL (#56)

* Updating packages, adding new configuration for KCL

* Updating to SBT 1.1.1, upgrading plugins, using scalafmt plugin compatible w/ 1.1.1

* Upgrading docker-compose, downgrading KCL due to kinesisalite issue

* Removing KCL 1.9.0 config references, fixing travis scalafmt::test ref

* Excluding older jgit packages

* Updates travis to use 2.12.5

Author: etspaceman

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: scala
 scala:
 - 2.11.11
-- 2.12.4
+- 2.12.5
 jdk:
 - oraclejdk8
 cache:
@@ -15,7 +15,7 @@ before_script:
 - docker-compose -f localstack/docker-compose.yml up -d
 - docker ps -a
 script:
-- sbt ++$TRAVIS_SCALA_VERSION clean coverage scalafmtTest test it:test
+- sbt ++$TRAVIS_SCALA_VERSION clean coverage scalafmt::test test it:test
 # Tagged releases
 - if [ $TRAVIS_TEST_RESULT -eq 0 -a "$TRAVIS_PULL_REQUEST" = "false" ] && [[ "$TRAVIS_TAG"
   =~ ^v[0-9]+\.[0-9]+(\.[0-9]+)?(-M[0-9]+)?$ ]]; then echo "** Publishing Release
@@ -36,7 +36,7 @@ before_cache:
 - find $HOME/.sbt        -name "*.lock"               -print -delete
 env:
   global:
-  - DOCKER_COMPOSE_VERSION=1.17.1
+  - DOCKER_COMPOSE_VERSION=1.19.0
   - secure: KffThTeOg0ELt+iw5ZNtDW6x4/1iKIj1v91Yq6earF+YQquusROqt/MtdmyXRG9ho0c/xnB82BJHrBsvac6SwsPUZ/cRvQ0KML3bWyCMCL2B/SurhjxbahAWdgQGj67KO1n72q24cqyRMb9wCCOwy4p/7qomBYM+m8YRLc6YOxxj6DKriIiqOq8jFmt/nktpCUhXVURYvFxHtHQvLutaWWICwGZX1ibyloCmC3wWPMNOFc/1FBqLXNQTUTKuYOOC46TJ5janON1E2obDKZyGf/Q/ZEuNymcJYKi6/7XWzN24Ep194PLGj29J44Zpp9P36hnIiET8dQ1s2Dafo+alubqFEUaP4fV8XyYu5ZtTt5A0wxKEe/u7N4SdxzUZF/zBszCLRL2uJhQlfC7af6keCpIVoKLDi+9b6zpSVLDZmE1UmFuu8LLoMY2s2xRt6vHXTSiyPrIJaIFyaryxjhH+KmKNE0GW1jzVkPc6NpxjnVtF2E7LYogHWHzJLoMpBtTQoAeJlKvtbEmWrZXO9TGPFzu0fb+x/H0Ocre2QDSnjKobtMZs6S8zvD+STfmrZ8ZtZ0H0HNbGJW/rPkSZFLunOPXWxSZzNoWNrzg9LCoPtdkVsa7BYiAY9fM9xNX8SOx/kRZtw52el71jK8mDCV/lQjzjBwyo3AZl/jOx3cbWrAM=
   - secure: KClWy/cCpMSKyJmVNOt8Dmwfatgx/9KsffLcL/BlXUYsBkB3jwdr9SzFok1ArGd02FzrFQU739/wnSKpmsW1fEO64tlh+qJwW76+gFlqWmOjc6r7ENH2u6LGLfRYeD4r76CiEV9mnU5GVMUPJIfbxlP0zB7ukzSGZwbkJ4WBqlxmurRr70jWz2F3ytJM0r31rpqc+ypHi58vj0NPBO7bR6XI4kquW9cDpCCgj4CVVshpsxUB1N4RPzcGsxUPucigH71lJ0sZjnEjSB+E95/Ovbf7PuPYnY0N8S6hLEgTyh7xAcxNpMsFgd1GInb92hrXLujUZU5N2BeX7jnYVa90q55AZd+IQqmJU+/4tBBrgWvppMIiTbbU5pnDoNqHNWmfB4wtbxwNW4y4tQH+/wSVPhgGYOWfsj3nLNnyfcjRAClQzEWCoAbx7Tkgj1OmvrOqwwmiPz3dFMInawQ6RkisqwgjT/sAhNGa2i26Tpj5Sd8XAjxU61MAzsr8gpVdA6TJcSdHkHC2zZVn+64Cc9WHJ9I6WbRD0fR3pFeTbQv+0SOUWV1owqtdGLl6z0gdI5rLZIYO7SMeRPjTYf/5NV/WxF2LcJu06LHYpzURaGQHp6T5NH2eEZof1Dt5tqa2eQ7KfZyui3rz3WB0AQlJSPK9yL78BvZzNlCNWbv5wLiW6hQ=
 before_install:

build.sbt

@@ -5,14 +5,14 @@
 lazy val `reactive-kinesis` =
   project
     .in(file("."))
-    .enablePlugins(AutomateHeaderPlugin, GitVersioning)
+    .enablePlugins(AutomateHeaderPlugin, GitVersioning, ScalafmtCorePlugin)
     .settings(settings)
     .configs(IntegrationTest)
     .settings(Defaults.itSettings: _*)
     .settings(
       libraryDependencies ++=
         library.jackson ++ library.amazon ++ library.lightbend ++
-          library.logback ++ library.testing
+        library.logback ++ library.testing
     )
 
 // *****************************************************************************
@@ -24,47 +24,48 @@ lazy val library =
 
     object Version {
       val scalaCheck = "1.13.5"
-      val scalaTest = "3.0.3"
-      val jackson = "2.8.7"
-      val akka = "2.5.7"
+      val scalaTest  = "3.0.5"
+      val jackson    = "2.9.4"
+      val akka       = "2.5.11"
     }
 
     val jackson = Seq(
       //We need jackson versions to be consistent, KCL&KPL pull in slightly older versions which often get evicted
       //See: https://github.com/aws/aws-sdk-java/issues/999
-      "com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % Version.jackson    % Compile,
-      "com.fasterxml.jackson.core" % "jackson-databind"              % Version.jackson    % Compile,
-      "com.fasterxml.jackson.core" % "jackson-core"                  % Version.jackson    % Compile,
-      "com.fasterxml.jackson.core" % "jackson-annotations"           % "2.8.0"            % Compile,
-      "com.fasterxml.uuid"         % "java-uuid-generator"           % "3.1.4"            % Compile)
+      "com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % Version.jackson % Compile,
+      "com.fasterxml.jackson.core"       % "jackson-databind"        % Version.jackson % Compile,
+      "com.fasterxml.jackson.core"       % "jackson-core"            % Version.jackson % Compile,
+      "com.fasterxml.jackson.core"       % "jackson-annotations"     % Version.jackson % Compile,
+      "com.fasterxml.uuid"               % "java-uuid-generator"     % "3.1.5"         % Compile
+    )
 
     val amazon = Seq(
-      "com.amazonaws"              % "amazon-kinesis-client"         % "1.8.8"            % Compile
-        excludeAll(
-          ExclusionRule(organization = "com.fasterxml.jackson.core"),
-          ExclusionRule(organization = "com.fasterxml.jackson.dataformat")),
-      "com.amazonaws"              % "amazon-kinesis-producer"       % "0.12.8"           % Compile
-        excludeAll(
-          ExclusionRule(organization = "com.fasterxml.jackson.core"),
-          ExclusionRule(organization = "com.fasterxml.jackson.dataformat"))
+      // TODO: Upgrade this to 1.9.x when this issue is resolved and exposed in localstack:
+      // https://github.com/mhart/kinesalite/issues/59
+      "com.amazonaws" % "amazon-kinesis-client" % "1.8.10" % Compile
+      excludeAll (ExclusionRule(organization = "com.fasterxml.jackson.core"),
+      ExclusionRule(organization = "com.fasterxml.jackson.dataformat")),
+      "com.amazonaws" % "amazon-kinesis-producer" % "0.12.8" % Compile
+      excludeAll (ExclusionRule(organization = "com.fasterxml.jackson.core"),
+      ExclusionRule(organization = "com.fasterxml.jackson.dataformat"))
     )
 
     val lightbend = Seq(
-      "com.typesafe"               % "config"                        % "1.3.1"            % Compile,
-      "com.typesafe.akka"          %% "akka-actor"                   % Version.akka       % Compile,
-      "com.typesafe.akka"          %% "akka-stream"                  % Version.akka       % Compile,
-      "com.typesafe.scala-logging" %% "scala-logging"                % "3.5.0"            % Compile
-      )
+      "com.typesafe"               % "config"         % "1.3.3"      % Compile,
+      "com.typesafe.akka"          %% "akka-actor"    % Version.akka % Compile,
+      "com.typesafe.akka"          %% "akka-stream"   % Version.akka % Compile,
+      "com.typesafe.scala-logging" %% "scala-logging" % "3.8.0"      % Compile
+    )
 
     val logback = Seq(
-      "ch.qos.logback"             % "logback-classic"               % "1.1.11"            % Compile
+      "ch.qos.logback" % "logback-classic" % "1.2.3" % Compile
     )
 
     val testing = Seq(
-      "org.scalatest"              %% "scalatest"                    % Version.scalaTest  % "it,test",
-      "org.scalacheck"             %% "scalacheck"                   % Version.scalaCheck % "it,test",
-      "com.typesafe.akka"          %% "akka-testkit"                 % Version.akka       % "it,test",
-      "org.mockito"                % "mockito-core"                  % "2.7.15"           % "it,test"
+      "org.scalatest"     %% "scalatest"    % Version.scalaTest  % "it,test",
+      "org.scalacheck"    %% "scalacheck"   % Version.scalaCheck % "it,test",
+      "com.typesafe.akka" %% "akka-testkit" % Version.akka       % "it,test",
+      "org.mockito"       % "mockito-core"  % "2.16.0"           % "it,test"
     )
   }
 
@@ -73,9 +74,9 @@ lazy val library =
 // *****************************************************************************
 
 lazy val settings =
-  commonSettings ++
-    headerSettings ++
-    versioningSettings
+commonSettings ++
+headerSettings ++
+versioningSettings
 
 lazy val commonSettings =
   Seq(
@@ -84,50 +85,53 @@ lazy val commonSettings =
     organization := "com.weightwatchers",
     mappings.in(Compile, packageBin) += baseDirectory.in(ThisBuild).value / "LICENSE" -> "LICENSE",
     scalacOptions ++= Seq( //http://tpolecat.github.io/2017/04/25/scalac-flags.html
-      "-deprecation",                      // Emit warning and location for usages of deprecated APIs.
-      "-encoding", "utf-8",                // Specify character encoding used by source files.
-      "-explaintypes",                     // Explain type errors in more detail.
-      "-feature",                          // Emit warning and location for usages of features that should be imported explicitly.
-      "-language:existentials",            // Existential types (besides wildcard types) can be written and inferred
-      "-language:experimental.macros",     // Allow macro definition (besides implementation and application)
-      "-language:higherKinds",             // Allow higher-kinded types
-      "-language:implicitConversions",     // Allow definition of implicit functions called views
-      "-unchecked",                        // Enable additional warnings where generated code depends on assumptions.
-      "-Xcheckinit",                       // Wrap field accessors to throw an exception on uninitialized access.
-      "-Xfatal-warnings",                  // Fail the compilation if there are any warnings.
-      "-Xfuture",                          // Turn on future language features.
-      "-Xlint:adapted-args",               // Warn if an argument list is modified to match the receiver.
-      "-Xlint:by-name-right-associative",  // By-name parameter of right associative operator.
-      "-Xlint:delayedinit-select",         // Selecting member of DelayedInit.
-      "-Xlint:doc-detached",               // A Scaladoc comment appears to be detached from its element.
-      "-Xlint:inaccessible",               // Warn about inaccessible types in method signatures.
-      "-Xlint:infer-any",                  // Warn when a type argument is inferred to be `Any`.
-      "-Xlint:missing-interpolator",       // A string literal appears to be missing an interpolator id.
-      "-Xlint:nullary-override",           // Warn when non-nullary `def f()' overrides nullary `def f'.
-      "-Xlint:nullary-unit",               // Warn when nullary methods return Unit.
-      "-Xlint:option-implicit",            // Option.apply used implicit view.
-      "-Xlint:package-object-classes",     // Class or object defined in package object.
-      "-Xlint:poly-implicit-overload",     // Parameterized overloaded implicit methods are not visible as view bounds.
-      "-Xlint:private-shadow",             // A private field (or class parameter) shadows a superclass field.
-      "-Xlint:stars-align",                // Pattern sequence wildcard must align with sequence component.
-      "-Xlint:type-parameter-shadow",      // A local type parameter shadows a type already in scope.
-      "-Xlint:unsound-match",              // Pattern match may not be typesafe.
-      "-Yno-adapted-args",                 // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
-      "-Ypartial-unification",             // Enable partial unification in type constructor inference
-      "-Ywarn-dead-code",                  // Warn when dead code is identified.
-      "-Ywarn-inaccessible",               // Warn about inaccessible types in method signatures.
-      "-Ywarn-infer-any",                  // Warn when a type argument is inferred to be `Any`.
-      "-Ywarn-nullary-override",           // Warn when non-nullary `def f()' overrides nullary `def f'.
-      "-Ywarn-nullary-unit",               // Warn when nullary methods return Unit.
-      "-Ywarn-numeric-widen"               // Warn when numerics are widened.
+      "-deprecation", // Emit warning and location for usages of deprecated APIs.
+      "-encoding",
+      "utf-8", // Specify character encoding used by source files.
+      "-explaintypes", // Explain type errors in more detail.
+      "-feature", // Emit warning and location for usages of features that should be imported explicitly.
+      "-language:existentials", // Existential types (besides wildcard types) can be written and inferred
+      "-language:experimental.macros", // Allow macro definition (besides implementation and application)
+      "-language:higherKinds", // Allow higher-kinded types
+      "-language:implicitConversions", // Allow definition of implicit functions called views
+      "-unchecked", // Enable additional warnings where generated code depends on assumptions.
+      "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access.
+      "-Xfatal-warnings", // Fail the compilation if there are any warnings.
+      "-Xfuture", // Turn on future language features.
+      "-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver.
+      "-Xlint:by-name-right-associative", // By-name parameter of right associative operator.
+      "-Xlint:delayedinit-select", // Selecting member of DelayedInit.
+      "-Xlint:doc-detached", // A Scaladoc comment appears to be detached from its element.
+      "-Xlint:inaccessible", // Warn about inaccessible types in method signatures.
+      "-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`.
+      "-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id.
+      "-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
+      "-Xlint:nullary-unit", // Warn when nullary methods return Unit.
+      "-Xlint:option-implicit", // Option.apply used implicit view.
+      "-Xlint:package-object-classes", // Class or object defined in package object.
+      "-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds.
+      "-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field.
+      "-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component.
+      "-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope.
+      "-Xlint:unsound-match", // Pattern match may not be typesafe.
+      "-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
+      "-Ypartial-unification", // Enable partial unification in type constructor inference
+      "-Ywarn-dead-code", // Warn when dead code is identified.
+      "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures.
+      "-Ywarn-infer-any", // Warn when a type argument is inferred to be `Any`.
+      "-Ywarn-nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
+      "-Ywarn-nullary-unit", // Warn when nullary methods return Unit.
+      "-Ywarn-numeric-widen" // Warn when numerics are widened.
     ),
     scalacOptions in (Compile, doc) ++= Seq(
       "-no-link-warnings" // Suppresses problems with Scaladoc @throws links
     ),
-    scalacOptions in (Compile, console) ~= (_.filterNot(Set(
-      "-Ywarn-unused:imports",
-      "-Xfatal-warnings"
-    ))),
+    scalacOptions in (Compile, console) ~= (_.filterNot(
+      Set(
+        "-Ywarn-unused:imports",
+        "-Xfatal-warnings"
+      )
+    )),
     unmanagedSourceDirectories.in(Compile) := Seq(scalaSource.in(Compile).value),
     unmanagedSourceDirectories.in(Test) := Seq(scalaSource.in(Test).value),
     shellPrompt in ThisBuild := { state =>
@@ -138,7 +142,10 @@ lazy val commonSettings =
     parallelExecution in IntegrationTest := false,
     fork in IntegrationTest := true,
     javaOptions in IntegrationTest += "-Dcom.amazonaws.sdk.disableCertChecking=true",
-    envVars in IntegrationTest += ("AWS_CBOR_DISABLE" -> "true")
+    envVars in IntegrationTest += ("AWS_CBOR_DISABLE" -> "true"),
+    scalafmtOnCompile := true,
+    scalafmtTestOnCompile := true,
+    scalafmtVersion := "1.3.0"
   )
 
 /* This allows to derive an sbt version string from the git information.
@@ -149,29 +156,28 @@ lazy val commonSettings =
  * ELSE IF the latest found tag is "vX.Y.Z", the version is "X.Y.Z-commitsSinceVersion-gCommitHash-SNAPSHOT"
  * ELSE the version is "0.0.0-commitHash-SNAPSHOT"
  */
-val VersionRegex = "v([0-9]+.[0-9]+.[0-9]+)-?(.*)?".r
+val VersionRegex   = "v([0-9]+.[0-9]+.[0-9]+)-?(.*)?".r
 val MilestoneRegex = "^M[0-9]$".r
 lazy val versioningSettings =
   Seq(
     git.baseVersion := "0.0.0",
     git.useGitDescribe := true,
     git.uncommittedSignifier := None,
     git.gitTagToVersionNumber := {
-      case VersionRegex(v, "")                      => Some(v) //e.g. 1.0.0
-      case VersionRegex(v, s)
-        if MilestoneRegex.findFirstIn(s).isDefined  => Some(s"$v-$s") //e.g. 1.0.0-M1
-      case VersionRegex(v, "SNAPSHOT")              => Some(s"$v-SNAPSHOT") //e.g. 1.0.0-SNAPSHOT
-      case VersionRegex(v, s)                       => Some(s"$v-$s-SNAPSHOT") //e.g. 1.0.0-2-commithash-SNAPSHOT
-      case _                                        => None
+      case VersionRegex(v, "") => Some(v) //e.g. 1.0.0
+      case VersionRegex(v, s) if MilestoneRegex.findFirstIn(s).isDefined =>
+        Some(s"$v-$s") //e.g. 1.0.0-M1
+      case VersionRegex(v, "SNAPSHOT") => Some(s"$v-SNAPSHOT") //e.g. 1.0.0-SNAPSHOT
+      case VersionRegex(v, s)          => Some(s"$v-$s-SNAPSHOT") //e.g. 1.0.0-2-commithash-SNAPSHOT
+      case _                           => None
     }
   )
 
-import de.heikoseeberger.sbtheader.license._
 import sbt.Keys.parallelExecution
 
 lazy val headerSettings =
   Seq(
-    headers := Map("scala" -> Apache2_0("2017", "WeightWatchers"))
+    headerLicense := Some(HeaderLicense.ALv2("2017", "WeightWatchers"))
   )
 
 coverageExcludedPackages := "reference.conf"

project/AutomateScalafmtPlugin.scala

@@ -1 +1 @@
-sbt.version = 0.13.15
+sbt.version = 1.1.1