Skip to content

Commit

Permalink
0.2.4: Updated sbt-slamdata
Browse files Browse the repository at this point in the history
(Merge branch 'djspiewak-build/upgrade-sbt-slamdata')

This enables local publication.
  • Loading branch information
jsantos17 committed Jul 19, 2018
2 parents 6b160e8 + 683da1c commit e2a755b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 40 deletions.
34 changes: 3 additions & 31 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,17 @@ import sbt._, Keys._
import sbt.std.Transform.DummyTaskMap
import sbt.TestFrameworks.Specs2
import sbtrelease._, ReleaseStateTransformations._, Utilities._
import scoverage._
import slamdata.SbtSlamData.transferPublishAndTagResources

val BothScopes = "test->test;compile->compile"

// Exclusive execution settings
lazy val ExclusiveTests = config("exclusive") extend Test

val ExclusiveTest = Tags.Tag("exclusive-test")

def exclusiveTasks(tasks: Scoped*) =
tasks.flatMap(inTask(_)(tags := Seq((ExclusiveTest, 1))))

lazy val buildSettings = commonBuildSettings ++ Seq(
organization := "com.slamdata",
scalaOrganization := "org.scala-lang",
scalacOptions --= Seq(
"-Yliteral-types",
"-Xstrict-patmat-analysis",
"-Yinduction-heuristics",
"-Ykind-polymorphism",
"-Ybackend:GenBCode"
),
initialize := {
val version = sys.props("java.specification.version")
assert(
Integer.parseInt(version.split("\\.")(1)) >= 8,
"Java 8 or above required, found " + version)
},

ScoverageKeys.coverageHighlighting := true,

scalacOptions += "-target:jvm-1.8",

// NB: -Xlint triggers issues that need to be fixed
scalacOptions --= Seq("-Xlint"),
lazy val buildSettings = Seq(

// NB: Some warts are disabled in specific projects. Here’s why:
// • AsInstanceOf – wartremover/wartremover#266
// • others – simply need to be reviewed & fixed
Expand All @@ -62,8 +37,6 @@ lazy val buildSettings = commonBuildSettings ++ Seq(
// Exclusive tests include only those tagged with 'exclusive'.
testOptions in ExclusiveTests := Seq(Tests.Argument(Specs2, "include", "exclusive", "showtimes")),

logBuffered in Test := isTravisBuild.value,

console := { (console in Test).value }, // console alias test:console
assemblyMergeStrategy in assembly := {
case PathList("META-INF", xs @ _*) => MergeStrategy.discard
Expand Down Expand Up @@ -95,7 +68,7 @@ concurrentRestrictions in Global := {
// Tasks tagged with `ExclusiveTest` should be run exclusively.
concurrentRestrictions in Global += Tags.exclusive(ExclusiveTest)

lazy val publishSettings = commonPublishSettings ++ Seq(
lazy val publishSettings = Seq(
performMavenCentralSync := false,
organizationName := "SlamData Inc.",
organizationHomepage := Some(url("http://quasar-analytics.org")),
Expand Down Expand Up @@ -163,7 +136,6 @@ def createBackendEntry(childPath: Seq[File], parentPath: Seq[File]): Seq[File] =
lazy val root = project.in(file("."))
.settings(commonSettings)
.settings(noPublishSettings)
.settings(transferPublishAndTagResources)
.settings(aggregate in assembly := false)
.settings(excludeTypelevelScalaLibrary)
.aggregate(datasource)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ final class S3DataSource[F[_]: Effect, G[_]: Async] (
}

private val FToG: FunctionK[F, G] = new FunctionK[F, G] {
implicit def ec0: ExecutionContext = ec

def apply[A](fa: F[A]): G[A] = fa.to[G]
}
}
5 changes: 2 additions & 3 deletions project/build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
disablePlugins(TravisCiPlugin)

libraryDependencies += "org.kohsuke" % "github-api" % "1.59" exclude("org.jenkins-ci", "annotation-indexer")

// used to fetch dependencies to form a coursier cache,
Expand All @@ -8,9 +10,6 @@ libraryDependencies ++= Seq(
"io.get-coursier" %% "coursier-cache" % "1.0.1"
)

// slamdata-predef things
scalacOptions ++= scalacOptions_2_12

scalacOptions --= Seq(
"-Ywarn-unused:imports",
"-Yinduction-heuristics",
Expand Down
3 changes: 1 addition & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
resolvers += Resolver.sonatypeRepo("releases")
resolvers += Resolver.bintrayRepo("slamdata-inc", "maven-public")
resolvers += Resolver.bintrayIvyRepo("djspiewak", "ivy")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("com.slamdata" % "sbt-slamdata" % "0.8.5")
addSbtPlugin("com.slamdata" % "sbt-slamdata" % "1.3.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
addSbtPlugin("com.github.romanowski" % "hoarder" % "1.0.2-RC2")
2 changes: 1 addition & 1 deletion project/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ resolvers += Resolver.bintrayRepo("slamdata-inc", "maven-public")
resolvers += Resolver.bintrayIvyRepo("djspiewak", "ivy")

addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12")
addSbtPlugin("com.slamdata" % "sbt-slamdata" % "0.7.1")
addSbtPlugin("com.slamdata" % "sbt-slamdata" % "1.3.0")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.2.3"
version in ThisBuild := "0.2.4"

0 comments on commit e2a755b

Please sign in to comment.