Skip to content

Commit

Permalink
move CaseClass1Rep to base module
Browse files Browse the repository at this point in the history
  • Loading branch information
mielnikk committed Feb 10, 2023
1 parent c0f00fb commit 2040325
Show file tree
Hide file tree
Showing 44 changed files with 46 additions and 44 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,7 @@ That's the basic usage. Inside the companion object you will get methods like `f
method `unwrap` plus an instance of `CaseClass1Rep[ISBN, String]`. A more complete example below.

```scala
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep
import pl.iterators.kebs.opaque._

object MyDomain {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package pl.iterators.kebs.matchers
import akka.http.scaladsl.server.{PathMatcher1, PathMatchers}
import enumeratum.{Enum, EnumEntry}
import pl.iterators.kebs.instances.InstanceConverter
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

import scala.language.implicitConversions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package pl.iterators.kebs.unmarshallers

import akka.http.scaladsl.unmarshalling.{FromStringUnmarshaller, Unmarshaller}
import pl.iterators.kebs.instances.InstanceConverter
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait KebsUnmarshallers {
implicit def kebsUnmarshaller[A, B](implicit rep: CaseClass1Rep[B, A]): Unmarshaller[A, B] =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class AkkaHttpMatchersTests
with URIString {

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[DayOfWeek, Int]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[Int, DayOfWeek]]" shouldNot typeCheck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AkkaHttpUnmarshallersTests
with DayOfWeekInt {

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[URI, String]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[String, URI]]" shouldNot typeCheck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package pl.iterators.kebs.circe
import io.circe.generic.AutoDerivation
import io.circe.{Decoder, Encoder}
import pl.iterators.kebs.instances.InstanceConverter
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

import scala.language.experimental.macros
import scala.util.Try
Expand Down
2 changes: 1 addition & 1 deletion doobie/src/main/scala-2/pl/iterators/kebs/Kebs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package pl.iterators.kebs

import doobie.Meta
import pl.iterators.kebs.instances.InstanceConverter
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

import scala.reflect.ClassTag

Expand Down
2 changes: 1 addition & 1 deletion doobie/src/main/scala-3/pl/iterators/kebs/Kebs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package pl.iterators.kebs
import doobie.{Get, Put, Meta}
import pl.iterators.kebs.enums.KebsEnums
import pl.iterators.kebs.instances.InstanceConverter
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

import scala.reflect.ClassTag

Expand Down
2 changes: 1 addition & 1 deletion http4s/src/main/scala-2/pl/iterators/kebs/Http4s.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package pl.iterators.kebs
import enumeratum.EnumEntry

import scala.util.Try
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.enums.EnumOf
import org.http4s._
import pl.iterators.kebs.instances.InstanceConverter
import pl.iterators.kebs.macros.base.CaseClass1Rep

import java.util.UUID

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package pl.iterators.kebs.http4s

import scala.util.Try
import scala.reflect.Enum
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep
import pl.iterators.kebs.macros.enums.EnumOf
import org.http4s._
import pl.iterators.kebs.instances.InstanceConverter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.jsonschema

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait KebsJsonSchema {
import macros.KebsJsonSchemaMacros
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait FractionalSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait IntegralSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait NumericSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait FractionalSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait IntegralSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait NumericSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package pl.iterators.kebs.macros
package pl.iterators.kebs.macros.base

import pl.iterators.kebs.macros.MacroUtils

import scala.language.experimental.macros
import scala.language.higherKinds
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait EquivSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait PartialOrderingSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pl.iterators.kebs.macros
package pl.iterators.kebs.macros.base

import scala.deriving.Mirror

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait EquivSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait FractionalSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait IntegralSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait NumericSupport {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.support

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait PartialOrderingSupport {

Expand Down
2 changes: 1 addition & 1 deletion macro-utils/src/test/scala-3/DerivingSpecification.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import org.scalacheck.Prop.forAll
import org.scalacheck.{Gen, Properties}
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep
import pl.iterators.kebs.macros.enums.EnumOf

object DerivingSpecification extends Properties("Deriving") {
Expand Down
2 changes: 1 addition & 1 deletion macro-utils/src/test/scala/NumbersDomain.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

object NumbersDomain {

Expand Down
2 changes: 1 addition & 1 deletion macro-utils/src/test/scala/StringsDomain.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

object StringsDomain {
trait Tag1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.iterators.kebs.opaque

import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait Opaque[OpaqueType, Unwrapped](using ev: OpaqueType =:= Unwrapped) {
/**
Expand Down
2 changes: 1 addition & 1 deletion opaque/src/test/scala-3/OpaqueTest.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.scalatest.funsuite.AnyFunSuite
import org.scalatest.matchers.should.Matchers
import pl.iterators.kebs.opaque.Opaque
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

object OpaqueTestDomain {
opaque type TestWrappedInt = Int
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package pl.iterators.kebs.json

import pl.iterators.kebs.instances.InstanceConverter
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep
import play.api.libs.json._

trait KebsPlay {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package pl.iterators.kebs.scalacheck

import enumeratum.ScalacheckInstances
import org.scalacheck.{Arbitrary, Gen, ScalacheckShapeless}
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

import java.net.{URI, URL}
import java.time.temporal.ChronoUnit
Expand Down
2 changes: 1 addition & 1 deletion slick/src/main/scala/pl/iterators/kebs/Kebs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package pl.iterators.kebs

import pl.iterators.kebs.hstore.KebsHStoreColumnExtensionMethods
import pl.iterators.kebs.instances.InstanceConverter
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep
import slick.ast.{BaseTypedType, NumericTypedType}
import slick.jdbc.JdbcType
import slick.lifted._
Expand Down
2 changes: 1 addition & 1 deletion slick/src/test/scala/arrays/ListIsomorphismTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class ListIsomorphismTest extends AnyFunSuite with Matchers with YearMonthString
case class C(a: String)

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[YearMonth, String]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[String, YearMonth]]" shouldNot typeCheck
Expand Down
2 changes: 1 addition & 1 deletion slick/src/test/scala/arrays/SlickPgArrayTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SlickPgArrayTests extends AnyFunSuite with Matchers {
}

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[YearMonth, String]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[String, YearMonth]]" shouldNot typeCheck
Expand Down
2 changes: 1 addition & 1 deletion slick/src/test/scala/hstore/MapIsomorphismTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class MapIsomorphismTest extends AnyFunSuite with Matchers with YearMonthString
case class IntValue(value: Int)

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[YearMonth, String]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[String, YearMonth]]" shouldNot typeCheck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class SlickPgHstoreColumnTypeTests extends AnyFunSuite with Matchers {
import MyPostgresProfile.api._

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[YearMonth, String]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[String, YearMonth]]" shouldNot typeCheck
Expand Down
2 changes: 1 addition & 1 deletion slick/src/test/scala/hstore/SlickPgHstoreTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class SlickPgHstoreTests extends AnyFunSuite with Matchers {
}

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[YearMonth, String]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[String, YearMonth]]" shouldNot typeCheck
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package pl.iterators.kebs.json

import pl.iterators.kebs.macros.CaseClass1Rep
import spray.json.{DefaultJsonProtocol, JsValue, JsonFormat, JsonReader, RootJsonFormat}
import pl.iterators.kebs.instances.InstanceConverter
import pl.iterators.kebs.macros.base.CaseClass1Rep

trait KebsSpray { self: DefaultJsonProtocol =>
import macros.KebsSprayMacros
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class NetInstancesTests extends AnyFunSuite with Matchers with DefaultJsonProtoc
}

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[URI, String]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[String, URI]]" shouldNot typeCheck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import pl.iterators.kebs.instances.time.LocalDateTimeString
import pl.iterators.kebs.instances.time.mixins.{DurationNanosLong, InstantEpochMilliLong}
import pl.iterators.kebs.instances.{InstanceConverter, TimeInstances}
import pl.iterators.kebs.json.KebsSpray
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep
import spray.json._

import java.time._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import java.time._
class TimeInstancesTests extends AnyFunSuite with Matchers with DefaultJsonProtocol with KebsSpray with TimeInstances {

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[DayOfWeek, Int]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[Int, DayOfWeek]]" shouldNot typeCheck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import java.util.{Currency, Locale, UUID}
class UtilInstancesTests extends AnyFunSuite with Matchers with DefaultJsonProtocol with KebsSpray with UtilInstances {

test("No CaseClass1Rep implicits derived") {
import pl.iterators.kebs.macros.CaseClass1Rep
import pl.iterators.kebs.macros.base.CaseClass1Rep

"implicitly[CaseClass1Rep[Currency, String]]" shouldNot typeCheck
"implicitly[CaseClass1Rep[String, Currency]]" shouldNot typeCheck
Expand Down

0 comments on commit 2040325

Please sign in to comment.