Skip to content
This repository has been archived by the owner on Jun 2, 2022. It is now read-only.

WIP - upgrade to sbt 1.0 #144

Merged
merged 3 commits into from
Oct 28, 2017
Merged

WIP - upgrade to sbt 1.0 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcf1164
wip
tpolecat Sep 20, 2017
d0c57e8
1.0.3
tpolecat Oct 27, 2017
0cca5e2
scalastyle
tpolecat Oct 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modules/core/shared/src/main/scala/gem/math/ProperMotion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -166,6 +167,7 @@ object ProperMotion {
(raʹʹ, decʹ)

}
// scalastyle:on method.length

}

Expand All @@ -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
}
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.16
sbt.version=1.0.3
14 changes: 7 additions & 7 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
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.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.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.1")
4 changes: 2 additions & 2 deletions scalastyle-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
<parameter name="regex"><![CDATA[println]]></parameter>
</parameters>
</check>
<check level="error" class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="true">
<!-- <check level="error" class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="true">
<parameters>
<parameter name="maxTypes"><![CDATA[25]]></parameter>
</parameters>
</check>
</check> -->
<!-- <check level="error" class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="true">
<parameters>
<parameter name="maximum"><![CDATA[10]]></parameter>
Expand Down