From fcf1164fb682980b26b08d80d7ecda6164589585 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Wed, 20 Sep 2017 13:20:37 -0700 Subject: [PATCH 1/3] wip --- project/build.properties | 2 +- project/plugins.sbt | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project/build.properties b/project/build.properties index c091b86c..b7dd3cb2 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 +sbt.version=1.0.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 98df8fe4..b7a7aceb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,12 +5,12 @@ libraryDependencies ++= Seq( "org.slf4j" % "slf4j-nop" % "1.7.21" // to silence some log messages ) -addSbtPlugin("org.flywaydb" % "flyway-sbt" % "4.2.0") -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4") -addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "2.0.0") -addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.2.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18") -addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") +// addSbtPlugin("org.flywaydb" % "flyway-sbt" % "4.2.0") // https://github.com/flyway/flyway/issues/1741 +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.2") +addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2") +addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.2.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20") +// addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") // https://github.com/jrudolph/sbt-dependency-graph/issues/134 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.1") From d0c57e82bfc0830297de5445746ba5d2b96ab7c2 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Fri, 27 Oct 2017 15:50:45 -0700 Subject: [PATCH 2/3] 1.0.3 --- project/build.properties | 2 +- project/plugins.sbt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/build.properties b/project/build.properties index b7dd3cb2..9abea129 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.2 +sbt.version=1.0.3 diff --git a/project/plugins.sbt b/project/plugins.sbt index b7a7aceb..c4fe4699 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,16 +1,16 @@ -resolvers += "Flyway" at "https://flywaydb.org/repo" +resolvers += "Flyway" at "https://davidmweber.github.io/flyway-sbt.repo" // "https://flywaydb.org/repo" libraryDependencies ++= Seq( "org.postgresql" % "postgresql" % "42.1.1", // needed by flyway "org.slf4j" % "slf4j-nop" % "1.7.21" // to silence some log messages ) -// addSbtPlugin("org.flywaydb" % "flyway-sbt" % "4.2.0") // https://github.com/flyway/flyway/issues/1741 +addSbtPlugin("org.flywaydb" % "flyway-sbt" % "4.2.0") addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.2") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2") -addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.2.0") +addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.2.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20") -// addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") // https://github.com/jrudolph/sbt-dependency-graph/issues/134 +addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.1") From 0cca5e2f8e2f1850c7aebf63f53b3c4bc0f5bef3 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Fri, 27 Oct 2017 16:06:27 -0700 Subject: [PATCH 3/3] scalastyle --- .../core/shared/src/main/scala/gem/math/ProperMotion.scala | 4 +++- scalastyle-config.xml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/core/shared/src/main/scala/gem/math/ProperMotion.scala b/modules/core/shared/src/main/scala/gem/math/ProperMotion.scala index 7969e355..5cabb7c5 100644 --- a/modules/core/shared/src/main/scala/gem/math/ProperMotion.scala +++ b/modules/core/shared/src/main/scala/gem/math/ProperMotion.scala @@ -113,6 +113,7 @@ object ProperMotion { * @param elapsedYears elapsed time in epoch years * @return (ra, dec) in radians, corrected for proper motion */ + // scalastyle:off method.length private def properMotionʹ( baseCoordinates: Vec2, daysPerYear: Double, @@ -166,6 +167,7 @@ object ProperMotion { (raʹʹ, decʹ) } + // scalastyle:on method.length } @@ -188,7 +190,7 @@ object ProperMotionExample { def main(args: Array[String]): Unit = { (0.0 to 10.0 by 1.0) foreach { y => val cs = Barnard.plusYears(y).baseCoordinates - println(s"${2000 + y} -> $cs") + println(s"${2000 + y} -> $cs") // scalastyle:off console.io } } diff --git a/scalastyle-config.xml b/scalastyle-config.xml index a69e53fb..5d130558 100644 --- a/scalastyle-config.xml +++ b/scalastyle-config.xml @@ -32,11 +32,11 @@ - +