Merge pull request #302 from dotty-staging/upstream

Migrations from Dotty

Author: cquiroz

build.sbt

@@ -15,7 +15,6 @@ lazy val squants = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(defaultSettings: _*)
   .jvmSettings(
     osgiSettings,
-    tutSettings,
     tutTargetDirectory := file("."),
     tutSourceDirectory := file("shared") / "src" / "main" / "tut"
   )
@@ -34,6 +33,6 @@ lazy val root = project.in(file("."))
   )
   .aggregate(squantsJVM, squantsJS, squantsNative)
 
-lazy val squantsJVM = squants.jvm.enablePlugins(SbtOsgi)
+lazy val squantsJVM = squants.jvm.enablePlugins(TutPlugin, SbtOsgi)
 lazy val squantsJS = squants.js
 lazy val squantsNative = squants.native

project/Build.scala

@@ -124,8 +124,10 @@ object Tests {
 
 object Formatting {
   import com.typesafe.sbt.SbtScalariform._
+  import com.typesafe.sbt.SbtScalariform.autoImport.scalariformAutoformat
 
-  lazy val defaultSettings = scalariformSettings ++ Seq(
+  lazy val defaultSettings = Seq(
+    ScalariformKeys.autoformat := false,
     ScalariformKeys.preferences in Compile := defaultPreferences,
     ScalariformKeys.preferences in Test := defaultPreferences
   )
@@ -137,7 +139,7 @@ object Formatting {
       .setPreference(AlignSingleLineCaseStatements, true)
       .setPreference(CompactControlReadability, true)
       .setPreference(CompactStringConcatenation, false)
-      .setPreference(DoubleIndentClassDeclaration, true)
+      .setPreference(DoubleIndentConstructorArguments, true)
       .setPreference(FormatXml, true)
       .setPreference(IndentLocalDefs, false)
       .setPreference(IndentPackageBlocks, true)
@@ -228,7 +230,7 @@ object Console {
 }
 
 object Docs {
-  private def gitHash = sys.process.Process("git rev-parse HEAD").lines_!.head
+  private def gitHash = sys.process.Process("git rev-parse HEAD").lineStream_!.head
   val defaultSettings = Seq(
     scalacOptions in (Compile, doc) ++= {
       val (bd, v) = ((baseDirectory in LocalRootProject).value, version.value)

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=1.1.4

project/plugins.sbt

@@ -1,17 +1,14 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.17")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "0.4.0")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.4.0")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "0.6.22")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.3.7")
 
-addSbtPlugin("org.scala-native" % "sbt-crossproject" % "0.2.0")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
 
-addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.2.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")
 
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.5.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.8.0")
-
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
-
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
-
-addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.8")
+addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.4")

shared/src/main/scala/squants/Dimensionless.scala

@@ -47,7 +47,7 @@ final class Dimensionless private (val value: Double, val unit: DimensionlessUni
  */
 object Dimensionless extends Dimension[Dimensionless] {
   def apply[A](n: A, unit: DimensionlessUnit)(implicit num: Numeric[A]) = new Dimensionless(num.toDouble(n), unit)
-  def apply = parse _
+  def apply(value: Any) = parse(value)
   def name = "Dimensionless"
   def primaryUnit = Each
   def siUnit = Each

shared/src/main/scala/squants/electro/AreaElectricChargeDensity.scala

@@ -23,7 +23,7 @@ final class AreaElectricChargeDensity private (val value: Double, val unit: Area
 
 object AreaElectricChargeDensity extends Dimension[AreaElectricChargeDensity] {
   private[electro] def apply[A](n: A, unit: AreaElectricChargeDensityUnit)(implicit num: Numeric[A]) = new AreaElectricChargeDensity(num.toDouble(n), unit)
-  def apply = parse _
+  def apply(value: Any) = parse(value)
   def name = "AreaElectricChargeDensity"
   def primaryUnit = CoulombsPerSquareMeter
   def siUnit = CoulombsPerSquareMeter

shared/src/main/scala/squants/electro/Capacitance.scala

@@ -34,7 +34,7 @@ final class Capacitance private (val value: Double, val unit: CapacitanceUnit)
 
 object Capacitance extends Dimension[Capacitance] {
   private[electro] def apply[A](n: A, unit: CapacitanceUnit)(implicit num: Numeric[A]) = new Capacitance(num.toDouble(n), unit)
-  def apply = parse _
+  def apply(value: Any) = parse(value)
   def name = "Capacitance"
   def primaryUnit = Farads
   def siUnit = Farads

shared/src/main/scala/squants/electro/Conductivity.scala

@@ -30,7 +30,7 @@ final class Conductivity private (val value: Double, val unit: ConductivityUnit)
 
 object Conductivity extends Dimension[Conductivity] {
   private[electro] def apply[A](n: A, unit: ConductivityUnit)(implicit num: Numeric[A]) = new Conductivity(num.toDouble(n), unit)
-  def apply = parse _
+  def apply(value: Any) = parse(value)
   def name = "Conductivity"
   def primaryUnit = SiemensPerMeter
   def siUnit = SiemensPerMeter

shared/src/main/scala/squants/electro/ElectricCharge.scala

@@ -48,7 +48,7 @@ final class ElectricCharge private (val value: Double, val unit: ElectricChargeU
 
 object ElectricCharge extends Dimension[ElectricCharge] {
   private[electro] def apply[A](n: A, unit: ElectricChargeUnit)(implicit num: Numeric[A]) = new ElectricCharge(num.toDouble(n), unit)
-  def apply = parse _
+  def apply(value: Any) = parse(value)
   def name = "ElectricCharge"
   def primaryUnit = Coulombs
   def siUnit = Coulombs

shared/src/main/scala/squants/electro/ElectricChargeDensity.scala

@@ -24,7 +24,7 @@ final class ElectricChargeDensity private (val value: Double, val unit: Electric
 
 object ElectricChargeDensity extends Dimension[ElectricChargeDensity] {
   private[electro] def apply[A](n: A, unit: ElectricChargeDensityUnit)(implicit num: Numeric[A]) = new ElectricChargeDensity(num.toDouble(n), unit)
-  def apply = parse _
+  def apply(value: Any) = parse(value)
   def name = "ElectricChargeDensity"
   def primaryUnit = CoulombsPerCubicMeter
   def siUnit = CoulombsPerCubicMeter