Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes macro implementation #13

Merged
merged 1 commit into from
Jun 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pgpSecretRing := file(s"$gpgFolder/secring.gpg")

lazy val commonDependencies: Seq[ModuleID] = Seq(
%%("cats-core"),
%%("freestyle-async", "0.2.0"),
%%("freestyle-async"),
%("cassandra-driver-core"),
%("cassandra-driver-mapping"),
%("cassandra-driver-extras"))
Expand All @@ -18,23 +18,10 @@ lazy val root = project
.in(file("."))
.settings(name := "freestyle-cassandra")
.settings(noPublishSettings)
.dependsOn(core, macros, macroTests)
.aggregate(core, macros, macroTests)
.dependsOn(core)
.aggregate(core)

lazy val core = project.in(file("core"))
.settings(moduleName := "freestyle-cassandra-core")
.settings(libraryDependencies ++= commonDependencies)
.settings(libraryDependencies ++= testDependencies)

lazy val macros = project.in(file("macros"))
.settings(moduleName := "freestyle-cassandra-macros")
.settings(libraryDependencies += %("scala-reflect", scalaVersion.value))
.settings(libraryDependencies ++= commonDependencies)
.settings(libraryDependencies ++= testDependencies)
.dependsOn(core)

lazy val macroTests = project.in(file("macro-tests"))
.settings(moduleName := "freestyle-cassandra-macro-tests")
.settings(noPublishSettings)
.settings(libraryDependencies ++= testDependencies)
.dependsOn(core, macros)
.settings(libraryDependencies ++= testDependencies)
55 changes: 0 additions & 55 deletions core/src/main/scala/freestyle/cassandra/model/Tables.scala

This file was deleted.

105 changes: 0 additions & 105 deletions macro-tests/src/test/scala/com/datastax/driver/core/CoreClasses.scala

This file was deleted.

33 changes: 0 additions & 33 deletions macro-tests/src/test/scala/freestyle/cassandra/macros/Model.scala

This file was deleted.

This file was deleted.

Loading