Skip to content

Commit

Permalink
Version Bump; Update Sbt + Dependencies; Kill warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
gilbertw1 committed Mar 8, 2018
1 parent 62d02bb commit f84f2ff
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 33 deletions.
5 changes: 5 additions & 0 deletions build.sbt
@@ -0,0 +1,5 @@
lazy val slackScalaClient =
Project ("slack-scala-client", file("."))
.settings ( BuildSettings.settings : _* )
.settings ( libraryDependencies ++= Dependencies.allDependencies )
.settings ( scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xfatal-warnings", "-Xlint", "-feature") )
34 changes: 8 additions & 26 deletions project/Build.scala
Expand Up @@ -5,11 +5,11 @@ import sbtrelease._

object BuildSettings {
val buildOrganization = "com.github.gilbertw1"
val buildVersion = "0.2.2"
val buildScalaVersion = "2.12.3"
val buildCrossScalaVersions = Seq("2.11.11", "2.12.3")
val buildVersion = "0.2.3"
val buildScalaVersion = "2.12.4"
val buildCrossScalaVersions = Seq("2.11.12", "2.12.4")

val buildSettings = Seq (
val settings = Seq (
organization := buildOrganization,
version := buildVersion,
scalaVersion := buildScalaVersion,
Expand Down Expand Up @@ -47,36 +47,18 @@ object BuildSettings {
)
}

object Resolvers {
val typesafeRepo = "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
}

object Dependencies {
val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.4"
val akkaHttp = "com.typesafe.akka" %% "akka-http-core" % "10.0.10"
val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.11"
val akkaHttp = "com.typesafe.akka" %% "akka-http-core" % "10.0.11"

val scalaAsync = "org.scala-lang.modules" %% "scala-async" % "0.9.7"
val playJson = "com.typesafe.play" %% "play-json" % "2.6.3"
val playJson = "com.typesafe.play" %% "play-json" % "2.6.9"

val scalatest = "org.scalatest" %% "scalatest" % "3.0.0" % "test"
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" % "test"

val akkaDependencies = Seq(akkaHttp)
val miscDependencies = Seq(playJson, scalaAsync)
val testDependencies = Seq(scalatest)

val allDependencies = akkaDependencies ++ miscDependencies ++ testDependencies
}

object SlackScalaClient extends Build {
import Resolvers._
import BuildSettings._
import Defaults._

lazy val slackScalaClient =
Project ("slack-scala-client", file("."))
.settings ( buildSettings : _* )
.settings ( resolvers ++= Seq(typesafeRepo) )
.settings ( libraryDependencies ++= Dependencies.allDependencies )
.settings ( scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xlint", "-feature") )

}
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=0.13.16
sbt.version=1.1.1
6 changes: 3 additions & 3 deletions project/plugins.sbt
@@ -1,6 +1,6 @@

addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.0")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
6 changes: 3 additions & 3 deletions src/main/scala/slack/api/SlackApiClient.scala
Expand Up @@ -2,7 +2,6 @@ package slack.api

import slack.models._

import java.nio.charset.StandardCharsets
import java.io.File
import scala.concurrent.duration._
import scala.concurrent.Future
Expand Down Expand Up @@ -620,8 +619,9 @@ class SlackApiClient(token: String) {
/**** Private Functions ****/
/*****************************/

private def uploadFileFromEntity(entity: MessageEntity, filetype: Option[String] = None, filename: Option[String] = None,
title: Option[String] = None, initialComment: Option[String] = None, channels: Option[Seq[String]] = None)(implicit system: ActorSystem): Future[SlackFile] = {
private def uploadFileFromEntity(entity: MessageEntity, filetype: Option[String], filename: Option[String],
title: Option[String], initialComment: Option[String], channels: Option[Seq[String]])
(implicit system: ActorSystem): Future[SlackFile] = {
val params = Seq (
"filetype" -> filetype,
"filename" -> filename,
Expand Down

0 comments on commit f84f2ff

Please sign in to comment.