Skip to content

Commit

Permalink
customizing build files
Browse files Browse the repository at this point in the history
Signed-off-by: yl790 <[email protected]>
  • Loading branch information
yitao-li committed Jun 16, 2020
1 parent b4f9ffa commit 07c2695
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 34 deletions.
11 changes: 8 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import scalariform.formatter.preferences._
import com.typesafe.sbt.SbtScalariform
import BuildUtil._

licenses += ("Apache-2.0", url("http://apache.org/licenses/LICENSE-2.0"))

lazy val formattingPreferences = {
import scalariform.formatter.preferences._
FormattingPreferences().
Expand All @@ -28,10 +30,14 @@ lazy val formattingPreferences = {
setPreference(SpacesAroundMultiImports, true)
}

val _scalaVersion: String = sys.props.getOrElse("scala.version", default = "2.12.8")
val _sparkVersion: String = sys.props.getOrElse("spark.version", default = "2.4.3")

lazy val compilationSettings = scalariformSettings ++ Seq(
name := "sparklyr-flint_" + _scalaVersion.substring(0, _scalaVersion.lastIndexOf(".")),
version := sys.props.getOrElse("version", default = "0.6.0-SNAPSHOT"),
organization := "com.twosigma",
scalaVersion := sys.props.getOrElse("scala.version", default = "2.12.8"),
scalaVersion := _scalaVersion,
assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false),
javacOptions ++= Seq("-source", "1.7", "-target", "1.7"),
compileOrder in Compile := CompileOrder.JavaThenScala,
Expand All @@ -58,7 +64,7 @@ lazy val versions = new {
val commons_math = "3.5"
val joda_time = "2.9.4"
val httpclient = "4.3.2" // Note that newer versions need to be configured
val spark = sys.props.getOrElse("spark.version", default = "2.4.3")
val spark = _sparkVersion
val scalatest = "3.0.8"
val scalacheck = "1.12.6"
val grizzled_slf4j = "1.3.0"
Expand Down Expand Up @@ -121,5 +127,4 @@ addCommandAlias(
"; set test in Test := {}; assembly"
)

publishTo := sonatypePublishTo.value
crossPaths := false
4 changes: 1 addition & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")

addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6")
28 changes: 0 additions & 28 deletions sonatype.sbt

This file was deleted.

0 comments on commit 07c2695

Please sign in to comment.