Skip to content
Open
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: scala
scala:
- 2.12.8
- 2.13.0

script: "sbt clean coverage test coverageReport && sbt coverageAggregate && sbt coveralls"
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ Date and time types and instances

## Getting Started

Wen is available for Scala 2.12. You can add wen to your sbt project by adding the following to
Wen is available for Scala 2.13 and 2.12. You can add wen to your sbt project by adding the following to
your `build.sbt`:

```scala
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
libraryDependencies += "dev.mlopes" %% "wen" % "1.0.0"
libraryDependencies += "dev.mlopes" %% "wen-cats" % "1.0.0" // For cats instances
libraryDependencies += "dev.mlopes" %% "wen-circe" % "1.0.0" // For circe encoders and decoders
```

## What is Wen?
Expand Down
66 changes: 14 additions & 52 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import Dependencies._

ThisBuild / scalaVersion := "2.12.8"
lazy val scala213 = "2.13.0"
lazy val scala212 = "2.12.8"

ThisBuild / scalaVersion := scala213
ThisBuild / organization := "dev.mlopes"
ThisBuild / organizationName := "mlopes"

Expand All @@ -9,6 +12,7 @@ lazy val wen = project
.aggregate(core, cats, circe)
.settings(name := "Wen Root")
.settings(
crossScalaVersions := Nil,
publish := {},
publishArtifact := false
)
Expand All @@ -19,7 +23,8 @@ lazy val core = project
.settings(
libraryDependencies ++= refinedDependencies,
libraryDependencies ++= testDependencies ++ catsDependencies.map(_ % Test),
defaultConfig
defaultConfig,
versionConfig
)

lazy val cats = project
Expand All @@ -29,7 +34,8 @@ lazy val cats = project
.settings(
libraryDependencies ++= catsDependencies,
libraryDependencies ++= testDependencies,
defaultConfig
defaultConfig,
versionConfig
)

lazy val circe = project
Expand All @@ -39,63 +45,19 @@ lazy val circe = project
.settings(
libraryDependencies ++= circeDependencies,
libraryDependencies ++= testDependencies ++ circeExtraDependencies.map(_ % Test),
defaultConfig
defaultConfig,
versionConfig
)

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.
"-explaintypes", // Explain type errors in more detail.
"-feature", // Emit warning and location for usages of features that should be imported explicitly.
"-language:existentials", // Existential types (besides wildcard types) can be written and inferred
"-language:experimental.macros", // Allow macro definition (besides implementation and application)
"-language:higherKinds", // Allow higher-kinded types
"-language:implicitConversions", // Allow definition of implicit functions called views
"-unchecked", // Enable additional warnings where generated code depends on assumptions.
"-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access.
"-Xfatal-warnings", // Fail the compilation if there are any warnings.
"-Xfuture", // Turn on future language features.
"-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver.
"-Xlint:by-name-right-associative", // By-name parameter of right associative operator.
"-Xlint:constant", // Evaluation of a constant arithmetic expression results in an error.
"-Xlint:delayedinit-select", // Selecting member of DelayedInit.
"-Xlint:doc-detached", // A Scaladoc comment appears to be detached from its element.
"-Xlint:inaccessible", // Warn about inaccessible types in method signatures.
"-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`.
"-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id.
"-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
"-Xlint:nullary-unit", // Warn when nullary methods return Unit.
"-Xlint:option-implicit", // Option.apply used implicit view.
"-Xlint:package-object-classes", // Class or object defined in package object.
"-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds.
"-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field.
"-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component.
"-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope.
"-Xlint:unsound-match", // Pattern match may not be typesafe.
"-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
"-Ypartial-unification", // Enable partial unification in type constructor inference
"-Ywarn-dead-code", // Warn when dead code is identified.
"-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined.
"-Ywarn-inaccessible", // Warn about inaccessible types in method signatures.
"-Ywarn-infer-any", // Warn when a type argument is inferred to be `Any`.
"-Ywarn-nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
"-Ywarn-nullary-unit", // Warn when nullary methods return Unit.
"-Ywarn-numeric-widen", // Warn when numerics are widened.
"-Ywarn-unused:implicits", // Warn if an implicit parameter is unused.
"-Ywarn-unused:imports", // Warn if an import selector is not referenced.
"-Ywarn-unused:locals", // Warn if a local definition is unused.
"-Ywarn-unused:params", // Warn if a value parameter is unused.
"-Ywarn-unused:patvars", // Warn if a variable bound in a pattern is unused.
"-Ywarn-unused:privates", // Warn if a private member is unused.
"-Ywarn-value-discard", // Warn when non-Unit expression results are unused.
"-Ywarn-macros:after" // Check for warning after marco expansion
lazy val versionConfig = Seq(
scalaVersion := scala213,
crossScalaVersions := List(scala213, scala212)
)

5 changes: 5 additions & 0 deletions notes/1.0.0.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
1.0.0-M1
========

- Add build for Scala 2.13

8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import sbt._

object Dependencies {

val scalaTestVersion = "3.0.7"
val scalaTestVersion = "3.0.8"
val scalaCheckVersion = "1.14.0"
val refinedVersion = "0.9.5"
val catsVersion = "1.6.0"
val circeVersion = "0.11.1"
val refinedVersion = "0.9.8"
val catsVersion = "2.0.0-M4"
val circeVersion = "0.12.0-M4"


lazy val testDependencies = Seq(
Expand Down
1 change: 1 addition & 0 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
sbt.version=1.2.8
scala.version=1.13.0
7 changes: 4 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.10")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.4.0")
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "1.1.0")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.4.2")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11")
addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.7")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "1.0.0-SNAPSHOT"
version in ThisBuild := "1.0.1-SNAPSHOT"