File tree 4 files changed +12
-103
lines changed
core/src/main/scala-2/fly4s/core/data
macros/src/main/scala-2/com/geirolz/macros/fluentcopy
4 files changed +12
-103
lines changed Original file line number Diff line number Diff line change @@ -34,25 +34,21 @@ lazy val fly4s: Project = project
34
34
.settings(
35
35
crossScalaVersions := Nil
36
36
)
37
- .aggregate(core, macros )
37
+ .aggregate(core)
38
38
39
39
lazy val core : Project =
40
40
buildModule(
41
41
prjModuleName = " core" ,
42
42
toPublish = true ,
43
43
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 = " ."
54
44
).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
+ }
56
52
)
57
53
58
54
// =============================== MODULES UTILS ===============================
Original file line number Diff line number Diff line change 1
1
package fly4s .core .data
2
2
3
3
import cats .data .NonEmptyList
4
- import com .geirolz .macros .fluentcopy . FluentCopyMacros .FluentCopy
4
+ import com .geirolz .macros .fluent . copy .FluentCopy
5
5
import fly4s .core .data .Fly4sConfigDefaults .*
6
6
7
7
import java .nio .charset .Charset
8
8
9
- @ FluentCopy
9
+ @ FluentCopy (collection = true )
10
10
case class Fly4sConfig (
11
11
connectRetries : Int = defaultConnectRetries,
12
12
initSql : Option [String ] = defaultInitSql,
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ object ProjectDependencies {
6
6
" org.typelevel" %% " cats-core" % " 2.9.0" ,
7
7
" org.typelevel" %% " cats-effect" % " 3.4.3" ,
8
8
" org.flywaydb" % " flyway-core" % " 9.1.5" ,
9
-
10
9
// test
11
10
" org.scalameta" %% " munit" % " 0.7.29" % Test ,
12
11
" org.typelevel" %% " munit-cats-effect-3" % " 1.0.7" % Test
@@ -25,11 +24,9 @@ object ProjectDependencies {
25
24
lazy val dedicated : Seq [ModuleID ] = Seq (
26
25
" com.h2database" % " h2" % " 2.1.214" % Test
27
26
)
28
- }
29
27
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"
33
30
)
34
31
}
35
32
}
You can’t perform that action at this time.
0 commit comments