Skip to content

Commit 51771b7

Browse files
committed
Drop macros module using fluent-copy library
1 parent 6e94a04 commit 51771b7

File tree

4 files changed

+12
-103
lines changed

4 files changed

+12
-103
lines changed

build.sbt

+8-12
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,21 @@ lazy val fly4s: Project = project
3434
.settings(
3535
crossScalaVersions := Nil
3636
)
37-
.aggregate(core, macros)
37+
.aggregate(core)
3838

3939
lazy val core: Project =
4040
buildModule(
4141
prjModuleName = "core",
4242
toPublish = true,
4343
folder = "."
44-
).dependsOn(macros)
45-
.settings(
46-
libraryDependencies ++= ProjectDependencies.Core.dedicated
47-
)
48-
49-
lazy val macros: Project =
50-
buildModule(
51-
prjModuleName = "macros",
52-
toPublish = true,
53-
folder = "."
5444
).settings(
55-
libraryDependencies ++= ProjectDependencies.Macros.dedicated
45+
libraryDependencies ++= ProjectDependencies.Core.dedicated,
46+
libraryDependencies ++= {
47+
CrossVersion.partialVersion(Keys.scalaVersion.value) match {
48+
case Some((2, _)) => ProjectDependencies.Core.for2_13_Only
49+
case _ => Nil
50+
}
51+
}
5652
)
5753

5854
//=============================== MODULES UTILS ===============================

core/src/main/scala-2/fly4s/core/data/Fly4sConfig.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package fly4s.core.data
22

33
import cats.data.NonEmptyList
4-
import com.geirolz.macros.fluentcopy.FluentCopyMacros.FluentCopy
4+
import com.geirolz.macros.fluent.copy.FluentCopy
55
import fly4s.core.data.Fly4sConfigDefaults.*
66

77
import java.nio.charset.Charset
88

9-
@FluentCopy
9+
@FluentCopy(collection = true)
1010
case class Fly4sConfig(
1111
connectRetries: Int = defaultConnectRetries,
1212
initSql: Option[String] = defaultInitSql,

macros/src/main/scala-2/com/geirolz/macros/fluentcopy/FluentCopyMacros.scala

-84
This file was deleted.

project/ProjectDependencies.scala

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ object ProjectDependencies {
66
"org.typelevel" %% "cats-core" % "2.9.0",
77
"org.typelevel" %% "cats-effect" % "3.4.3",
88
"org.flywaydb" % "flyway-core" % "9.1.5",
9-
109
// test
1110
"org.scalameta" %% "munit" % "0.7.29" % Test,
1211
"org.typelevel" %% "munit-cats-effect-3" % "1.0.7" % Test
@@ -25,11 +24,9 @@ object ProjectDependencies {
2524
lazy val dedicated: Seq[ModuleID] = Seq(
2625
"com.h2database" % "h2" % "2.1.214" % Test
2726
)
28-
}
2927

30-
object Macros {
31-
lazy val dedicated: Seq[ModuleID] = Seq(
32-
"org.scala-lang" % "scala-reflect" % "2.13.10"
28+
lazy val for2_13_Only: Seq[ModuleID] = Seq(
29+
"com.github.geirolz" %% "fluent-copy" % "0.0.1"
3330
)
3431
}
3532
}

0 commit comments

Comments
 (0)