Bump SBT to 0.13.15 (closes #83)

Author: BenFradet

build.sbt

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014-2017 Snowplow Analytics Ltd. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and
+ * limitations there under.
+ */
+lazy val root = project.in(file("."))
+  .settings(
+    name        := "snowplow-kinesis-s3",
+    version     := "0.4.1",
+    description := "Kinesis sink for S3"
+  )
+  .settings(BuildSettings.buildSettings)
+  .settings(BuildSettings.sbtAssemblySettings)
+  .settings(
+    libraryDependencies ++= Seq(
+      // Java
+      Dependencies.Libraries.kinesisClient,
+      Dependencies.Libraries.kinesisConnector,
+      Dependencies.Libraries.slf4j,
+      Dependencies.Libraries.hadoop,
+      Dependencies.Libraries.elephantbird,
+      Dependencies.Libraries.hadoopLZO,
+      Dependencies.Libraries.yodaTime,
+      // Scala
+      Dependencies.Libraries.scopt,
+      Dependencies.Libraries.config,
+      Dependencies.Libraries.scalaz7,
+      Dependencies.Libraries.json4sJackson,
+      Dependencies.Libraries.snowplowTracker,
+      // Scala (test only)
+      Dependencies.Libraries.specs2,
+      // Thrift (test only)
+      Dependencies.Libraries.collectorPayload
+    )
+  )
+
+shellPrompt := { _ => "kinesis-s3> " }

project/BuildSettings.scala

@@ -18,29 +18,44 @@ import Keys._
 object BuildSettings {
 
   // Basic settings for our app
-  lazy val basicSettings = Seq[Setting[_]](
+  lazy val basicSettings = Seq(
     organization          :=  "com.snowplowanalytics",
-    version               :=  "0.4.1",
-    description           :=  "Kinesis LZO sink for S3",
     scalaVersion          :=  "2.11.11",
-    scalacOptions         :=  Seq("-deprecation", "-encoding", "utf8",
-                                  "-feature", "-target:jvm-1.7"),
-    scalacOptions in Test :=  Seq("-Yrangepos"),
+    scalacOptions         :=  compilerOptions,
     resolvers             ++= Dependencies.resolvers
   )
 
+  lazy val compilerOptions = Seq(
+    "-deprecation",
+    "-encoding", "UTF-8",
+    "-feature",
+    "-language:existentials",
+    "-language:higherKinds",
+    "-language:implicitConversions",
+    "-unchecked",
+    "-Yno-adapted-args",
+    "-Ywarn-dead-code",
+    "-Ywarn-numeric-widen",
+    "-Xfuture",
+    "-Xlint"
+  )
+
   // Makes our SBT app settings available from within the app
-  lazy val scalifySettings = Seq(sourceGenerators in Compile <+= (sourceManaged in Compile, version, name, organization) map { (d, v, n, o) =>
-    val file = d / "settings.scala"
-    IO.write(file, """package com.snowplowanalytics.snowplow.storage.kinesis.s3.generated
-      |object Settings {
-      |  val organization = "%s"
-      |  val version = "%s"
-      |  val name = "%s"
-      |}
-      |""".stripMargin.format(o, v, n))
-    Seq(file)
-  })
+  lazy val scalifySettings = Seq(
+    sourceGenerators in Compile += Def.task {
+      val file = (sourceManaged in Compile).value / "settings.scala"
+      IO.write(file, """package com.snowplowanalytics.snowplow.storage.kinesis.s3.generated
+        |object Settings {
+        |  val organization = "%s"
+        |  val version = "%s"
+        |  val name = "%s"
+        |}
+        |""".stripMargin.format(organization.value, version.value, name.value))
+      Seq(file)
+    }.taskValue
+  )
+
+  lazy val buildSettings = basicSettings ++ scalifySettings
 
   // sbt-assembly settings for building a fat jar
   import sbtassembly.Plugin._
@@ -63,6 +78,4 @@ object BuildSettings {
 
     assemblyOption in assembly ~= { _.copy(cacheOutput = false) }
   )
-
-  lazy val buildSettings = basicSettings ++ scalifySettings ++ sbtAssemblySettings
 }

project/SnowplowS3SinkBuild.scala

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

project/build.properties

@@ -30,13 +30,6 @@ package object s3 {
    */
   type RawRecord = Array[Byte]
 
-  /**
-   * Case class to contain a Failed Record:
-   * - The list of errors
-   * - The original line, Base64 Encoded
-   */
-  case class FailedRecord(errors: List[String], line: String)
-
   /**
    * Validation for a SnowplowRawEvent
    */

src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/package.scala

@@ -0,0 +1,27 @@
+ /*
+ * Copyright (c) 2014-2015 Snowplow Analytics Ltd.
+ * All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache
+ * License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied.
+ *
+ * See the Apache License Version 2.0 for the specific language
+ * governing permissions and limitations there under.
+ */
+
+package com.snowplowanalytics.snowplow.storage.kinesis.s3
+
+  /**
+   * Case class to contain a Failed Record:
+   * - The list of errors
+   * - The original line, Base64 Encoded
+   */
+  case class FailedRecord(errors: List[String], line: String)

src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/FailedRecord.scala

@@ -84,7 +84,7 @@ class S3Emitter(config: KinesisConnectorConfiguration, badSink: ISink, serialize
    * The amount of time to wait in between unsuccessful index requests (in milliseconds).
    * 10 seconds = 10 * 1000 = 10000
    */
-  private val BackoffPeriod = 10000
+  private val BackoffPeriod = 10000L
 
   // An ISO valid timestamp formatter
   private val TstampFormat = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").withZone(DateTimeZone.UTC)
@@ -154,7 +154,7 @@ class S3Emitter(config: KinesisConnectorConfiguration, badSink: ISink, serialize
           val inputStream = new ByteArrayInputStream(outputStream.toByteArray)
 
           val objMeta = new ObjectMetadata()
-          objMeta.setContentLength(outputStream.size)
+          objMeta.setContentLength(outputStream.size.toLong)
 
           client.putObject(bucket, filename, inputStream, objMeta)
 
@@ -200,7 +200,7 @@ class S3Emitter(config: KinesisConnectorConfiguration, badSink: ISink, serialize
    *
    * Prevents shutdown hooks from running
    */
-  private def forceShutdown() {
+  private def forceShutdown(): Unit = {
     log.error(s"Shutting down application as unable to connect to S3 for over $maxConnectionTime ms")
     tracker foreach {
       t =>
@@ -213,7 +213,7 @@ class S3Emitter(config: KinesisConnectorConfiguration, badSink: ISink, serialize
   /**
    * Closes the client when the KinesisConnectorRecordProcessor is shut down
    */
-  override def shutdown() {
+  override def shutdown(): Unit = {
     client.shutdown
   }
 
@@ -223,7 +223,7 @@ class S3Emitter(config: KinesisConnectorConfiguration, badSink: ISink, serialize
    *
    * @param records List of failed records to send to Kinesis
    */
-  override def fail(records: java.util.List[ EmitterInput ]) {
+  override def fail(records: java.util.List[EmitterInput]): Unit = {
     // TODO: Should there be a check for Successes?
     for (Failure(record) <- records.toList) {
       log.warn(s"Record failed: $record.line")

src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/S3Emitter.scala

@@ -60,17 +60,17 @@ object SnowplowTracking {
    *
    * @param tracker a Tracker instance
    */
-  def initializeSnowplowTracking(tracker: Tracker) {
+  def initializeSnowplowTracking(tracker: Tracker): Unit = {
     trackApplicationInitialization(tracker)
 
     Runtime.getRuntime.addShutdownHook(new Thread() {
-      override def run() {
+      override def run(): Unit = {
         trackApplicationShutdown(tracker)
       }
     })
 
     val heartbeatThread = new Thread {
-      override def run() {
+      override def run(): Unit = {
         while (true) {
           trackApplicationHeartbeat(tracker, HeartbeatInterval)
           Thread.sleep(HeartbeatInterval)
@@ -95,7 +95,7 @@ object SnowplowTracking {
     lastRetryPeriod: Long,
     failureCount: Long,
     initialFailureTime: Long,
-    message: String) {
+    message: String): Unit = {
 
     tracker.trackUnstructEvent(SelfDescribingJson(
       "iglu:com.snowplowanalytics.monitoring.kinesis/storage_write_failed/jsonschema/1-0-0",
@@ -112,7 +112,7 @@ object SnowplowTracking {
    *
    * @param tracker a Tracker instance
    */
-  private def trackApplicationInitialization(tracker: Tracker) {
+  private def trackApplicationInitialization(tracker: Tracker): Unit = {
     tracker.trackUnstructEvent(SelfDescribingJson(
       "iglu:com.snowplowanalytics.monitoring.kinesis/app_initialized/jsonschema/1-0-0",
       JObject(Nil)
@@ -124,7 +124,7 @@ object SnowplowTracking {
    *
    * @param tracker a Tracker instance
    */
-  def trackApplicationShutdown(tracker: Tracker) {
+  def trackApplicationShutdown(tracker: Tracker): Unit = {
     tracker.trackUnstructEvent(SelfDescribingJson(
       "iglu:com.snowplowanalytics.monitoring.kinesis/app_shutdown/jsonschema/1-0-0",
       JObject(Nil)
@@ -137,7 +137,7 @@ object SnowplowTracking {
    * @param tracker a Tracker instance
    * @param heartbeatInterval Time between heartbeats in milliseconds
    */
-  private def trackApplicationHeartbeat(tracker: Tracker, heartbeatInterval: Long) {
+  private def trackApplicationHeartbeat(tracker: Tracker, heartbeatInterval: Long): Unit = {
     tracker.trackUnstructEvent(SelfDescribingJson(
       "iglu:com.snowplowanalytics.monitoring.kinesis/app_heartbeat/jsonschema/1-0-0",
       "interval" -> heartbeatInterval

src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/SnowplowTracking.scala

@@ -22,5 +22,5 @@ package com.snowplowanalytics.snowplow.storage.kinesis.s3.sinks
  * Shared interface for all sinks
  */
 trait ISink {
-  def store(output: String, key: Option[String], good: Boolean)
+  def store(output: String, key: Option[String], good: Boolean): Unit
 }

src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/sinks/ISink.scala

@@ -1,5 +1,5 @@
 oss-playbooks/java7.yml
 oss-playbooks/thrift.yml
 oss-playbooks/scala-2.11.6.yml
-oss-playbooks/sbt.yml
+oss-playbooks/sbt-13.8.yml
 oss-playbooks/lzo.yml