change package name

softwaremill · Oct 21, 2021 · 2bc32fb · 2bc32fb
1 parent 2bb2a00
commit 2bc32fb
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 22 deletions.
diff --git a/...Cats/src/main/scala/com/softwaremill/macwire/auto/catssupport/MacwireAutoCatsMacros.scala b/...Cats/src/main/scala/com/softwaremill/macwire/auto/catssupport/MacwireAutoCatsMacros.scala
@@ -1,4 +1,4 @@
-package com.softwaremill.macwire.auto.catssupport
+package com.softwaremill.macwire.autocats
 
 import scala.reflect.macros.blackbox
 import cats.effect.{IO, Resource => CatsResource}

diff --git a/macrosAutoCats/src/main/scala/com/softwaremill/macwire/auto/catssupport/package.scala b/macrosAutoCats/src/main/scala/com/softwaremill/macwire/auto/catssupport/package.scala
@@ -1,7 +1,7 @@
-package com.softwaremill.macwire.auto
+package com.softwaremill.macwire
 
 import cats.effect._
 
-package object catssupport {
+package object autocats {
  def autowire[T](dependencies: Any*): Resource[IO, T] = macro MacwireCatsEffectMacros.autowire_impl[T]
 }
diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/factoryNoParameters.success b/macrosAutoCatsTests/src/test/resources/test-cases/factoryNoParameters.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/factoryWithParameter.success b/macrosAutoCatsTests/src/test/resources/test-cases/factoryWithParameter.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/ioProvidedParameter.success b/macrosAutoCatsTests/src/test/resources/test-cases/ioProvidedParameter.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/resourceFactoryWithParameters.success b/macrosAutoCatsTests/src/test/resources/test-cases/resourceFactoryWithParameters.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/...osAutoCatsTests/src/test/resources/test-cases/resourceMultiLevelProvidedParameter.success b/...osAutoCatsTests/src/test/resources/test-cases/resourceMultiLevelProvidedParameter.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/resourceProvidedParameters.success b/macrosAutoCatsTests/src/test/resources/test-cases/resourceProvidedParameters.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/simpleAutoParameters.success b/macrosAutoCatsTests/src/test/resources/test-cases/simpleAutoParameters.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/simpleMissingDeps.failure b/macrosAutoCatsTests/src/test/resources/test-cases/simpleMissingDeps.failure
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 import cats.effect._
 
 class B(s: String)

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/simpleMissingDepsMultiLevel.failure b/macrosAutoCatsTests/src/test/resources/test-cases/simpleMissingDepsMultiLevel.failure
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 import cats.effect._
 
 class A(s: String)

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/simpleMultiLevelNoParameters.success b/macrosAutoCatsTests/src/test/resources/test-cases/simpleMultiLevelNoParameters.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 import cats.effect._
 

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/simpleMultiLevelProvidedParameter.success b/macrosAutoCatsTests/src/test/resources/test-cases/simpleMultiLevelProvidedParameter.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/simpleNoParameters.success b/macrosAutoCatsTests/src/test/resources/test-cases/simpleNoParameters.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/simpleProvidedParameter.success b/macrosAutoCatsTests/src/test/resources/test-cases/simpleProvidedParameter.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/simpleUsingCompanion.success b/macrosAutoCatsTests/src/test/resources/test-cases/simpleUsingCompanion.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 import cats.effect._
 
 object Test {

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/subtypeParameter.success b/macrosAutoCatsTests/src/test/resources/test-cases/subtypeParameter.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 import cats.effect._
 

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/taggingParameters.success b/macrosAutoCatsTests/src/test/resources/test-cases/taggingParameters.success
@@ -1,6 +1,6 @@
 import cats.effect._
 import com.softwaremill.tagging._
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 class Cache {
  val state = scala.collection.mutable.HashMap.empty[String, String]

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/todo/chainingFactoryMethods.success b/macrosAutoCatsTests/src/test/resources/test-cases/todo/chainingFactoryMethods.success
@@ -0,0 +1,25 @@
+import com.softwaremill.macwire.autocats._
+
+#include commonSimpleClasses
+import cats.effect._
+
+
+val created = scala.collection.mutable.Set[String]()
+
+object Test {
+ def theA(): Resource[IO, A] = { created.add("a"); Resource.pure(A()) }
+ def theB(b: A): Resource[IO, B] = { created.add("b"); Resource.pure(B()) }
+ val theC: Resource[IO, C] = autowire[C](theA _, theB _)
+}
+
+val theC: C = {
+ import cats.effect.unsafe.implicits.global
+ Test.theC.allocated.unsafeRunSync()._1
+}
+
+require(theC.a != null)
+require(theC.b != null)
+
+require(created.size == 2)
+require(created.contains("a"))
+require(created.contains("B"))
diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/todo/factoryMethodWithWiredParam.success b/macrosAutoCatsTests/src/test/resources/test-cases/todo/factoryMethodWithWiredParam.success
diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/todo/factoryWithParameterFromIO.success b/macrosAutoCatsTests/src/test/resources/test-cases/todo/factoryWithParameterFromIO.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/...AutoCatsTests/src/test/resources/test-cases/todo/factoryWithParameterFromResource.success b/...AutoCatsTests/src/test/resources/test-cases/todo/factoryWithParameterFromResource.success
@@ -1,4 +1,4 @@
-import com.softwaremill.macwire.auto.catssupport._
+import com.softwaremill.macwire.autocats._
 
 #include commonSimpleClasses
 import cats.effect._

diff --git a/...AutoCatsTests/src/test/scala/com/softwaremill/macwire/auto/catssupport/CompileTests.scala b/...AutoCatsTests/src/test/scala/com/softwaremill/macwire/auto/catssupport/CompileTests.scala
@@ -1,4 +1,4 @@
-package com.softwaremill.macwire.auto.catssupport
+package com.softwaremill.macwire.autocats
 
 import com.softwaremill.macwire.CompileTestsSupport