Added validation macros

sksamuel · Dec 12, 2017 · e2c5f86 · e2c5f86
1 parent a50f0c5
commit e2c5f86
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 96 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,20 +1,7 @@
 lazy val root = Project("monkeytail", file("."))
-  .settings(publish := {})
-  .settings(publishArtifact := false)
   .settings(name := "monkeytail")
-  .aggregate(
-    core,
-    macros
-  )
-
-lazy val macros = Project("monkeytail-macros", file("monkeytail-macros"))
-  .settings(name := "monkeytail-macros")
   .settings(libraryDependencies ++= Seq(
     "org.scala-lang" % "scala-reflect"  % scalaVersion.value,
     "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
     "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test"
-  ))
-
-lazy val core = Project("monkeytail-core", file("monkeytail-core"))
-  .settings(name := "monkeytail-core")
-  .dependsOn(macros)
+  ))
diff --git a/monkeytail-core/src/test/scala/com/sksamuel/monkeytail/ValidationTest.scala b/monkeytail-core/src/test/scala/com/sksamuel/monkeytail/ValidationTest.scala
diff --git a/monkeytail-macros/src/main/scala/com/sksamuel/monkeytail/ValidationResult.scala b/monkeytail-macros/src/main/scala/com/sksamuel/monkeytail/ValidationResult.scala
diff --git a/monkeytail-macros/src/main/scala/com/sksamuel/monkeytail/Validator.scala b/monkeytail-macros/src/main/scala/com/sksamuel/monkeytail/Validator.scala
diff --git a/monkeytail-macros/src/main/scala/com/sksamuel/monkeytail/macros/Validate.scala b/monkeytail-macros/src/main/scala/com/sksamuel/monkeytail/macros/Validate.scala
diff --git a/project/Build.scala b/project/Build.scala
@@ -12,14 +12,13 @@ object Build extends AutoPlugin {
     val org = "com.sksamuel.monkeytail"
     val CatsVersion = "1.0.0-RC1"
     val ScalatestVersion = "3.0.4"
-    val Slf4jVersion = "1.7.25"
   }
 
   import autoImport._
 
   override def projectSettings = Seq(
     organization := org,
-    scalaVersion := "2.11.12",
+    scalaVersion := "2.12.4",
     crossScalaVersions := Seq("2.11.12", "2.12.4"),
     publishMavenStyle := true,
     resolvers += Resolver.mavenLocal,
@@ -32,10 +31,9 @@ object Build extends AutoPlugin {
     sbtrelease.ReleasePlugin.autoImport.releasePublishArtifactsAction := PgpKeys.publishSigned.value,
     sbtrelease.ReleasePlugin.autoImport.releaseCrossBuild := true,
     scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8"),
-    javacOptions := Seq("-source", "1.7", "-target", "1.7"),
+    javacOptions := Seq("-source", "1.8", "-target", "1.8"),
     libraryDependencies ++= Seq(
       "org.typelevel"                         %% "cats-core"                % CatsVersion,
-      "org.slf4j"                             %  "slf4j-api"                % Slf4jVersion,
       "org.scalatest"                         %% "scalatest"                % ScalatestVersion      % "test"
     ),
     publishTo := {