From 0a25ae5cfbb349ab5a8c749e6cb26b6aabe1fbf5 Mon Sep 17 00:00:00 2001 From: Alexey Alekhin Date: Mon, 23 Oct 2017 12:52:01 +0200 Subject: [PATCH 1/2] Updated the build --- build.sbt | 15 ++++++++------- project/build.properties | 2 +- project/plugins.sbt | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/build.sbt b/build.sbt index ff78127..9bfbda2 100644 --- a/build.sbt +++ b/build.sbt @@ -1,15 +1,16 @@ name := "projects" organization := "era7bio" description := "projects project" - bucketSuffix := "era7.com" +crossScalaVersions := Seq("2.11.11", "2.12.3") +scalaVersion := crossScalaVersions.value.last + libraryDependencies ++= Seq( - "ohnosequences" %% "cosas" % "0.8.0", - "ohnosequences" %% "aws-scala-tools" % "0.18.1", - "ohnosequences" %% "datasets" % "0.4.1" + "ohnosequences" %% "cosas" % "0.10.1", + "ohnosequences" %% "aws-scala-tools" % "0.20.0", + "ohnosequences" %% "datasets" % "0.5.2" ) -// NOTE should be reestablished -wartremoverErrors in (Test, compile) := Seq() -wartremoverErrors in (Compile, compile) := Seq() +// wartremoverErrors in (Test, compile) := Seq() +// wartremoverErrors in (Compile, compile) := Seq() diff --git a/project/build.properties b/project/build.properties index 27e88aa..017bb86 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version = 1.0.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index a09d647..f363bd4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers ++= Seq( "Era7 maven releases" at "https://s3-eu-west-1.amazonaws.com/releases.era7.com", - "repo.jenkins-ci.org" at "https://repo.jenkins-ci.org/public" + "repo.jenkins-ci.org" at "https://repo.jenkins-ci.org/public", + Resolver.jcenterRepo ) - -addSbtPlugin("ohnosequences" % "nice-sbt-settings" % "0.8.0-RC5") +addSbtPlugin("ohnosequences" % "nice-sbt-settings" % "0.9.0") From 4688f67bbb2a2ab80bd21a16237b911a6a208f08 Mon Sep 17 00:00:00 2001 From: Alexey Alekhin Date: Mon, 23 Oct 2017 13:21:59 +0200 Subject: [PATCH 2/2] Fixed compilation error related to the definition of AnyDataSet --- src/main/scala/projects.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scala/projects.scala b/src/main/scala/projects.scala index 5f8e4b6..e2a8c18 100644 --- a/src/main/scala/projects.scala +++ b/src/main/scala/projects.scala @@ -75,7 +75,9 @@ trait AnyTask extends AnyType { type Input <: AnyDataSet val input: Input - type Output <: AnyDataSet + // FIXME: this is supposed to be the same: + // type Output <: AnyDataSet // = AnyRecordType.Of[AnyData] + type Output <: AnyRecordType { type Keys <: AnyProductType { type Types <: AnyKList { type Bound <: AnyData } } } val output: Output // NOTE in a future better world we could use this