diff --git a/build.sbt b/build.sbt index 1713527b..89dceee3 100644 --- a/build.sbt +++ b/build.sbt @@ -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 @@ -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 @@ -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")), @@ -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) diff --git a/datasource/src/main/scala/quasar/physical/s3/S3DataSource.scala b/datasource/src/main/scala/quasar/physical/s3/S3DataSource.scala index 5dc1e1c9..eb5a29c0 100644 --- a/datasource/src/main/scala/quasar/physical/s3/S3DataSource.scala +++ b/datasource/src/main/scala/quasar/physical/s3/S3DataSource.scala @@ -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] } } diff --git a/project/build.sbt b/project/build.sbt index fe7b1280..2e10c0a5 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -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, @@ -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", diff --git a/project/plugins.sbt b/project/plugins.sbt index dce1e5af..5be04d4c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index 2c184b58..12c76253 100644 --- a/project/project/plugins.sbt +++ b/project/project/plugins.sbt @@ -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") diff --git a/version.sbt b/version.sbt index 46265fff..166f9d77 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.2.3" \ No newline at end of file +version in ThisBuild := "0.2.4" \ No newline at end of file