mlopes · mlopes · May 18, 2019 · May 17, 2019 · May 17, 2019 · May 18, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,4 @@ language: scala
 scala:
     - 2.12.8
 
-script: "sbt clean coverage test coverageReport coveralls"
+script: "sbt clean coverage test coverageReport && sbt coverageAggregate && sbt coveralls"
diff --git a/README.md b/README.md
@@ -53,7 +53,9 @@ Wen is available for Scala 2.12. You can add wen to your sbt project by adding t
 your `build.sbt`:
 
 ```scala
-libraryDependencies += "dev.mlopes" %% "wen" % "0.9.0"
+libraryDependencies += "dev.mlopes" %% "wen" % "1.0.0-M1"
+libraryDependencies += "dev.mlopes" %% "wen-cats" % "1.0.0-M1" // For cats instances
+libraryDependencies += "dev.mlopes" %% "wen-circe" % "1.0.0-M1" // For circe encoders and decoders
 ```
 
 ## What is Wen?

diff --git a/build.sbt b/build.sbt
@@ -1,23 +1,55 @@
 import Dependencies._
 
 ThisBuild / scalaVersion     := "2.12.8"
-ThisBuild / version          := "0.1.0-SNAPSHOT"
 ThisBuild / organization     := "dev.mlopes"
 ThisBuild / organizationName := "mlopes"
 
 lazy val wen = project
   .in(file("."))
-  .settings(moduleName := "wen", name := "Wen")
+  .aggregate(core, cats, circe)
+  .settings(name := "Wen Root")
   .settings(
-    scalacOptions := appScalacOptions,
-    compile in Compile := (compile in Compile).dependsOn(dependencyUpdates).value,
-    libraryDependencies ++= scalaTest,
-    libraryDependencies ++= wenDependencies,
-    coverageMinimum := 100,
-    coverageFailOnMinimum := true,
-    publishTo := sonatypePublishTo.value
+    publish := {},
+    publishArtifact := false
   )
 
+lazy val core = project
+  .in(file("modules/core"))
+  .settings(moduleName := "wen", name := "Wen", description := "Idiomatic Date and Time types")
+  .settings(
+    libraryDependencies ++= refinedDependencies,
+    libraryDependencies ++= testDependencies ++ catsDependencies.map(_ % Test),
+    defaultConfig
+  )
+
+lazy val cats = project
+  .in(file("modules/cats"))
+  .dependsOn(core)
+  .settings(moduleName := "wen-cats", name := "Wen Cats", description := "Cats instances for Wen")
+  .settings(
+    libraryDependencies ++= catsDependencies,
+    libraryDependencies ++= testDependencies,
+    defaultConfig
+  )
+
+lazy val circe = project
+  .in(file("modules/circe"))
+  .dependsOn(core % "compile->compile;test->test", cats)
+  .settings(moduleName := "wen-circe", name := "Wen Circe", description := "Circe encoders and decoders for Wen types")
+  .settings(
+    libraryDependencies ++= circeDependencies,
+    libraryDependencies ++= testDependencies ++ circeExtraDependencies.map(_ % Test),
+    defaultConfig
+  )
+
+lazy val defaultConfig = Seq(
+  scalacOptions := appScalacOptions,
+  compile in Compile := (compile in Compile).dependsOn(dependencyUpdates).value,
+  coverageMinimum := 100,
+  coverageFailOnMinimum := true,
+  publishTo := sonatypePublishTo.value
+)
+
 lazy val appScalacOptions = Seq(
   "-deprecation",                      // Emit warning and location for usages of deprecated APIs.
   "-encoding", "utf-8",                // Specify character encoding used by source files.

diff --git a/src/main/scala/wen/implicits.scala → ...s/cats/src/main/scala/wen/implicits.scala b/src/main/scala/wen/implicits.scala → ...s/cats/src/main/scala/wen/implicits.scala
diff --git a/...in/scala/wen/instances/DayInstances.scala → ...in/scala/wen/instances/DayInstances.scala b/...in/scala/wen/instances/DayInstances.scala → ...in/scala/wen/instances/DayInstances.scala
diff --git a/.../scala/wen/instances/EpochInstances.scala → .../scala/wen/instances/EpochInstances.scala b/.../scala/wen/instances/EpochInstances.scala → .../scala/wen/instances/EpochInstances.scala
diff --git a/...n/scala/wen/instances/HourInstances.scala → ...n/scala/wen/instances/HourInstances.scala b/...n/scala/wen/instances/HourInstances.scala → ...n/scala/wen/instances/HourInstances.scala
diff --git a/.../wen/instances/MillisecondInstances.scala → .../wen/instances/MillisecondInstances.scala b/.../wen/instances/MillisecondInstances.scala → .../wen/instances/MillisecondInstances.scala
diff --git a/...scala/wen/instances/MinuteInstances.scala → ...scala/wen/instances/MinuteInstances.scala b/...scala/wen/instances/MinuteInstances.scala → ...scala/wen/instances/MinuteInstances.scala
diff --git a/.../scala/wen/instances/MonthInstances.scala → .../scala/wen/instances/MonthInstances.scala b/.../scala/wen/instances/MonthInstances.scala → .../scala/wen/instances/MonthInstances.scala
diff --git a/...scala/wen/instances/SecondInstances.scala → ...scala/wen/instances/SecondInstances.scala b/...scala/wen/instances/SecondInstances.scala → ...scala/wen/instances/SecondInstances.scala
diff --git a/...cala/wen/instances/WeekDayInstances.scala → ...cala/wen/instances/WeekDayInstances.scala b/...cala/wen/instances/WeekDayInstances.scala → ...cala/wen/instances/WeekDayInstances.scala
diff --git a/...n/scala/wen/instances/YearInstances.scala → ...n/scala/wen/instances/YearInstances.scala b/...n/scala/wen/instances/YearInstances.scala → ...n/scala/wen/instances/YearInstances.scala
diff --git a/...en/instances/datetime/DateInstances.scala → ...en/instances/datetime/DateInstances.scala b/...en/instances/datetime/DateInstances.scala → ...en/instances/datetime/DateInstances.scala
diff --git a/...nstances/datetime/DateTimeInstances.scala → ...nstances/datetime/DateTimeInstances.scala b/...nstances/datetime/DateTimeInstances.scala → ...nstances/datetime/DateTimeInstances.scala
diff --git a/...en/instances/datetime/TimeInstances.scala → ...en/instances/datetime/TimeInstances.scala b/...en/instances/datetime/TimeInstances.scala → ...en/instances/datetime/TimeInstances.scala
diff --git a/...ala/wen/instances/iso/DateInstances.scala → ...ala/wen/instances/iso/DateInstances.scala b/...ala/wen/instances/iso/DateInstances.scala → ...ala/wen/instances/iso/DateInstances.scala
diff --git a/...wen/instances/iso/DateTimeInstances.scala → ...wen/instances/iso/DateTimeInstances.scala b/...wen/instances/iso/DateTimeInstances.scala → ...wen/instances/iso/DateTimeInstances.scala
diff --git a/...ala/wen/instances/iso/TimeInstances.scala → ...ala/wen/instances/iso/TimeInstances.scala b/...ala/wen/instances/iso/TimeInstances.scala → ...ala/wen/instances/iso/TimeInstances.scala
diff --git a/...ain/scala/wen/instances/iso/package.scala → ...ain/scala/wen/instances/iso/package.scala b/...ain/scala/wen/instances/iso/package.scala → ...ain/scala/wen/instances/iso/package.scala
diff --git a/...cala/wen/instances/DayInstancesSpec.scala → ...cala/wen/instances/DayInstancesSpec.scala b/...cala/wen/instances/DayInstancesSpec.scala → ...cala/wen/instances/DayInstancesSpec.scala
diff --git a/...la/wen/instances/EpochInstancesSpec.scala → ...la/wen/instances/EpochInstancesSpec.scala b/...la/wen/instances/EpochInstancesSpec.scala → ...la/wen/instances/EpochInstancesSpec.scala
diff --git a/...ala/wen/instances/HourInstancesSpec.scala → ...ala/wen/instances/HourInstancesSpec.scala b/...ala/wen/instances/HourInstancesSpec.scala → ...ala/wen/instances/HourInstancesSpec.scala
diff --git a/.../instances/MillisecondInstancesSpec.scala → .../instances/MillisecondInstancesSpec.scala b/.../instances/MillisecondInstancesSpec.scala → .../instances/MillisecondInstancesSpec.scala
diff --git a/...a/wen/instances/MinuteInstancesSpec.scala → ...a/wen/instances/MinuteInstancesSpec.scala b/...a/wen/instances/MinuteInstancesSpec.scala → ...a/wen/instances/MinuteInstancesSpec.scala
diff --git a/...la/wen/instances/MonthInstancesSpec.scala → ...la/wen/instances/MonthInstancesSpec.scala b/...la/wen/instances/MonthInstancesSpec.scala → ...la/wen/instances/MonthInstancesSpec.scala
diff --git a/...a/wen/instances/SecondInstancesSpec.scala → ...a/wen/instances/SecondInstancesSpec.scala b/...a/wen/instances/SecondInstancesSpec.scala → ...a/wen/instances/SecondInstancesSpec.scala
diff --git a/.../wen/instances/WeekDayInstancesSpec.scala → .../wen/instances/WeekDayInstancesSpec.scala b/.../wen/instances/WeekDayInstancesSpec.scala → .../wen/instances/WeekDayInstancesSpec.scala
diff --git a/...ala/wen/instances/YearInstancesSpec.scala → ...ala/wen/instances/YearInstancesSpec.scala b/...ala/wen/instances/YearInstancesSpec.scala → ...ala/wen/instances/YearInstancesSpec.scala
diff --git a/...nstances/datetime/DateInstancesSpec.scala → ...nstances/datetime/DateInstancesSpec.scala b/...nstances/datetime/DateInstancesSpec.scala → ...nstances/datetime/DateInstancesSpec.scala
diff --git a/...nces/datetime/DateTimeInstancesSpec.scala → ...nces/datetime/DateTimeInstancesSpec.scala b/...nces/datetime/DateTimeInstancesSpec.scala → ...nces/datetime/DateTimeInstancesSpec.scala
diff --git a/...nstances/datetime/TimeInstancesSpec.scala → ...nstances/datetime/TimeInstancesSpec.scala b/...nstances/datetime/TimeInstancesSpec.scala → ...nstances/datetime/TimeInstancesSpec.scala
diff --git a/.../instances/iso/IsoDateInstancesSpec.scala → .../instances/iso/IsoDateInstancesSpec.scala b/.../instances/iso/IsoDateInstancesSpec.scala → .../instances/iso/IsoDateInstancesSpec.scala
diff --git a/...tances/iso/IsoDateTimeInstancesSpec.scala → ...tances/iso/IsoDateTimeInstancesSpec.scala b/...tances/iso/IsoDateTimeInstancesSpec.scala → ...tances/iso/IsoDateTimeInstancesSpec.scala
diff --git a/.../instances/iso/IsoTimeInstancesSpec.scala → .../instances/iso/IsoTimeInstancesSpec.scala b/.../instances/iso/IsoTimeInstancesSpec.scala → .../instances/iso/IsoTimeInstancesSpec.scala
diff --git a/src/main/scala/wen/circe/package.scala → ...ce/src/main/scala/wen/circe/package.scala b/src/main/scala/wen/circe/package.scala → ...ce/src/main/scala/wen/circe/package.scala
diff --git a/src/test/scala/wen/circe/CirceSpec.scala → .../src/test/scala/wen/circe/CirceSpec.scala b/src/test/scala/wen/circe/CirceSpec.scala → .../src/test/scala/wen/circe/CirceSpec.scala
diff --git a/src/main/scala/wen/datetime/Date.scala → ...re/src/main/scala/wen/datetime/Date.scala b/src/main/scala/wen/datetime/Date.scala → ...re/src/main/scala/wen/datetime/Date.scala
diff --git a/src/main/scala/wen/datetime/DateTime.scala → ...rc/main/scala/wen/datetime/DateTime.scala b/src/main/scala/wen/datetime/DateTime.scala → ...rc/main/scala/wen/datetime/DateTime.scala
diff --git a/src/main/scala/wen/datetime/Time.scala → ...re/src/main/scala/wen/datetime/Time.scala b/src/main/scala/wen/datetime/Time.scala → ...re/src/main/scala/wen/datetime/Time.scala
diff --git a/...ain/scala/wen/datetime/ZoneDateTime.scala → ...ain/scala/wen/datetime/ZoneDateTime.scala b/...ain/scala/wen/datetime/ZoneDateTime.scala → ...ain/scala/wen/datetime/ZoneDateTime.scala
diff --git a/src/main/scala/wen/datetime/ZoneTime.scala → ...rc/main/scala/wen/datetime/ZoneTime.scala b/src/main/scala/wen/datetime/ZoneTime.scala → ...rc/main/scala/wen/datetime/ZoneTime.scala
diff --git a/src/main/scala/wen/refine/package.scala → ...e/src/main/scala/wen/refine/package.scala b/src/main/scala/wen/refine/package.scala → ...e/src/main/scala/wen/refine/package.scala
diff --git a/src/main/scala/wen/types/types.scala → ...core/src/main/scala/wen/types/types.scala b/src/main/scala/wen/types/types.scala → ...core/src/main/scala/wen/types/types.scala
diff --git a/src/test/scala/wen/datetime/DateSpec.scala → ...rc/test/scala/wen/datetime/DateSpec.scala b/src/test/scala/wen/datetime/DateSpec.scala → ...rc/test/scala/wen/datetime/DateSpec.scala
diff --git a/...est/scala/wen/datetime/DateTimeSpec.scala → ...est/scala/wen/datetime/DateTimeSpec.scala b/...est/scala/wen/datetime/DateTimeSpec.scala → ...est/scala/wen/datetime/DateTimeSpec.scala
diff --git a/src/test/scala/wen/datetime/OffsetSpec.scala → .../test/scala/wen/datetime/OffsetSpec.scala b/src/test/scala/wen/datetime/OffsetSpec.scala → .../test/scala/wen/datetime/OffsetSpec.scala
diff --git a/src/test/scala/wen/datetime/TimeSpec.scala → ...rc/test/scala/wen/datetime/TimeSpec.scala b/src/test/scala/wen/datetime/TimeSpec.scala → ...rc/test/scala/wen/datetime/TimeSpec.scala
diff --git a/...scala/wen/datetime/ZoneDateTimeSpec.scala → ...scala/wen/datetime/ZoneDateTimeSpec.scala b/...scala/wen/datetime/ZoneDateTimeSpec.scala → ...scala/wen/datetime/ZoneDateTimeSpec.scala
diff --git a/...est/scala/wen/datetime/ZoneTimeSpec.scala → ...est/scala/wen/datetime/ZoneTimeSpec.scala b/...est/scala/wen/datetime/ZoneTimeSpec.scala → ...est/scala/wen/datetime/ZoneTimeSpec.scala
diff --git a/src/test/scala/wen/refine/refineSpec.scala → ...rc/test/scala/wen/refine/refineSpec.scala b/src/test/scala/wen/refine/refineSpec.scala → ...rc/test/scala/wen/refine/refineSpec.scala
diff --git a/src/test/scala/wen/test/Arbitraries.scala → ...src/test/scala/wen/test/Arbitraries.scala b/src/test/scala/wen/test/Arbitraries.scala → ...src/test/scala/wen/test/Arbitraries.scala
diff --git a/src/test/scala/wen/test/Generators.scala → .../src/test/scala/wen/test/Generators.scala b/src/test/scala/wen/test/Generators.scala → .../src/test/scala/wen/test/Generators.scala
diff --git a/src/test/scala/wen/types/DaySpec.scala → ...re/src/test/scala/wen/types/DaySpec.scala b/src/test/scala/wen/types/DaySpec.scala → ...re/src/test/scala/wen/types/DaySpec.scala
diff --git a/src/test/scala/wen/types/HourSpec.scala → ...e/src/test/scala/wen/types/HourSpec.scala b/src/test/scala/wen/types/HourSpec.scala → ...e/src/test/scala/wen/types/HourSpec.scala
diff --git a/...est/scala/wen/types/MillisecondSpec.scala → ...est/scala/wen/types/MillisecondSpec.scala b/...est/scala/wen/types/MillisecondSpec.scala → ...est/scala/wen/types/MillisecondSpec.scala
diff --git a/src/test/scala/wen/types/MinuteSpec.scala → ...src/test/scala/wen/types/MinuteSpec.scala b/src/test/scala/wen/types/MinuteSpec.scala → ...src/test/scala/wen/types/MinuteSpec.scala
diff --git a/src/test/scala/wen/types/MonthSpec.scala → .../src/test/scala/wen/types/MonthSpec.scala b/src/test/scala/wen/types/MonthSpec.scala → .../src/test/scala/wen/types/MonthSpec.scala
diff --git a/src/test/scala/wen/types/SecondSpec.scala → ...src/test/scala/wen/types/SecondSpec.scala b/src/test/scala/wen/types/SecondSpec.scala → ...src/test/scala/wen/types/SecondSpec.scala
diff --git a/src/test/scala/wen/types/WeekDaySpec.scala → ...rc/test/scala/wen/types/WeekDaySpec.scala b/src/test/scala/wen/types/WeekDaySpec.scala → ...rc/test/scala/wen/types/WeekDaySpec.scala
diff --git a/src/test/scala/wen/types/YearSpec.scala → ...e/src/test/scala/wen/types/YearSpec.scala b/src/test/scala/wen/types/YearSpec.scala → ...e/src/test/scala/wen/types/YearSpec.scala
diff --git a/notes/1.0.0-M1.markdown b/notes/1.0.0-M1.markdown
@@ -0,0 +1,5 @@
+1.0.0-M1
+========
+
+- Split project in 3, now there's wen, wen-cats, and wen-circe
+
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,22 +9,28 @@ object Dependencies {
   val circeVersion = "0.11.1"
 
 
-  lazy val scalaTest = Seq(
-    "org.scalatest" %% "scalatest" % scalaTestVersion % Test
-   ,"org.scalactic" %% "scalactic" % scalaTestVersion % Test
-   ,"org.scalacheck" %% "scalacheck" % scalaCheckVersion % Test
-   ,"eu.timepit" %% "refined-scalacheck" % refinedVersion % Test
-   ,"eu.timepit" %% "refined" % refinedVersion
-   ,"org.typelevel" %% "cats-core" % catsVersion
-   ,"io.circe" %% "circe-core" % circeVersion
-   ,"io.circe" %% "circe-literal" % circeVersion
-   ,"io.circe" %% "circe-generic" % circeVersion
-   ,"org.typelevel" %% "jawn-parser" % "0.14.2"
+  lazy val testDependencies = Seq(
+    "org.scalatest" %% "scalatest" % scalaTestVersion
+   ,"org.scalactic" %% "scalactic" % scalaTestVersion
+   ,"org.scalacheck" %% "scalacheck" % scalaCheckVersion
+   ,"eu.timepit" %% "refined-scalacheck" % refinedVersion
+  ).map(_ % Test)
+
+  lazy val catsDependencies = Seq(
+    "org.typelevel" %% "cats-core" % catsVersion
   )
 
-  lazy val wenDependencies = Seq(
+  lazy val refinedDependencies = Seq(
     "eu.timepit" %% "refined" % refinedVersion
-   ,"org.typelevel" %% "cats-core" % catsVersion
-   ,"io.circe" %% "circe-core" % circeVersion % Optional
+  )
+
+  lazy val circeDependencies = Seq(
+    "io.circe" %% "circe-core" % circeVersion % Optional
+  )
+
+  lazy val circeExtraDependencies = Seq (
+    "io.circe" %% "circe-literal" % circeVersion
+   ,"io.circe" %% "circe-generic" % circeVersion
+   ,"org.typelevel" %% "jawn-parser" % "0.14.2"
   )
 }
diff --git a/publish.sbt b/publish.sbt
@@ -46,7 +46,6 @@ ensureVersionUpdateOnReadme in ThisBuild := {
   }
 }
 
-ThisBuild / description := "Date and time types and instances"
 ThisBuild / licenses := List("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
 ThisBuild / homepage := Some(url("https://github.com/mlopes/wen"))
 

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.9.1-SNAPSHOT"
+version in ThisBuild := "1.0.0-SNAPSHOT"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ language: scala @@
     scala:
         - 2.12.8
-    script: "sbt clean coverage test coverageReport coveralls"
+    script: "sbt clean coverage test coverageReport && sbt coverageAggregate && sbt coveralls"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "0.9.1-SNAPSHOT"
		version in ThisBuild := "1.0.0-SNAPSHOT"