Fixed error when companion object exists, updated dependencies

Author: MateuszKubuszok

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.1.0
+sbt.version = 1.2.1

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")
-
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
 addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.2.0")
 
 resolvers += Resolver.sonatypeRepo("releases")

build.sbt renamed to pulp.sbt

@@ -1,12 +1,14 @@
+import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
+
 val versions = new {
-  val scalaVersion = "2.12.4"
+  val scalaVersion = "2.12.6"
   val scalatestVersion = "3.0.4"
 }
 
 val settings = Seq(
-  version := "0.0.4",
+  version := "0.0.5",
   scalaVersion := versions.scalaVersion,
-  crossScalaVersions := Seq("2.11.12", "2.12.4"),
+  crossScalaVersions := Seq("2.11.12", "2.12.6"),
   scalacOptions ++= Seq(
     "-target:jvm-1.8",
     "-encoding",
@@ -59,15 +61,15 @@ val dependencies = Seq(
 
 lazy val root = project
   .in(file("."))
+  .settings(name := "pulp", description := "Pulp build")
   .settings(settings: _*)
   .settings(publishSettings: _*)
   .settings(noPublishSettings: _*)
   .aggregate(pulpJVM, pulpJS)
-  .dependsOn(pulpJVM, pulpJS)
 
-lazy val pulp = crossProject
+lazy val pulp = crossProject(JVMPlatform, JSPlatform)
   .crossType(CrossType.Pure)
-  .settings(moduleName := "pulp", name := "pulp", description := "Scala library for guiceless dependency injection")
+  .settings(name := "pulp", description := "Scala library for guiceless dependency injection")
   .settings(settings: _*)
   .settings(publishSettings: _*)
   .settings(dependencies: _*)

pulp/src/main/scala/io/scalaland/pulp/internals/ImplementedAsImpl.scala

@@ -36,7 +36,7 @@ private[pulp] class ImplementedAsImpl(val c: Context)(annottees: Seq[Any]) exten
   private def extendCompanion(objectDef: ModuleDef, classDef: ClassDef): ModuleDef = objectDef match {
     case q"$mods object $tname extends { ..$earlydefns } with ..$parents { $self => ..$body }" =>
       q"""$mods object $tname extends { ..$earlydefns } with ..$parents { $self =>
-            $body
+            ..$body
             ${buildProviderMethod(classDef)}
           }""": ModuleDef
   }

pulp/src/main/scala/io/scalaland/pulp/internals/WiredImpl.scala

@@ -42,7 +42,7 @@ private[pulp] class WiredImpl(wiredType: WiredImpl.Type)(val c: Context)(annotte
   private def extendCompanion(objectDef: ModuleDef, classDef: ClassDef): ModuleDef = objectDef match {
     case q"$mods object $tname extends { ..$earlydefns } with ..$parents { $self => ..$body }" =>
       q"""$mods object $tname extends { ..$earlydefns } with ..$parents { $self =>
-            $body
+            ..$body
             ${buildProviderMethod(classDef)}
           }""": ModuleDef
   }