From 795176a70c8023a442bae83b048c72d732094208 Mon Sep 17 00:00:00 2001 From: Tomas Mikula Date: Sat, 25 Apr 2020 15:30:07 +0200 Subject: [PATCH] Use CrossVersion.full. Build for Scala 2.13.1 and 2.13.2. Termporarily disable -Xfatal-warnings. --- README.md | 8 +------- build.sbt | 11 ++++++++--- project/build.properties | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8c277ce..6d75b26 100644 --- a/README.md +++ b/README.md @@ -170,13 +170,7 @@ new T { self => To use this plugin in your project, add the following line to your `build.sbt` file: ```scala -addCompilerPlugin("com.github.tomasmikula" %% "pascal" % "0.3.5") -``` - -If your project uses multiple Scala versions, use this for cross building instead - -```scala -addCompilerPlugin("com.github.tomasmikula" % "pascal" % "0.3.5" cross CrossVersion.binary) +addCompilerPlugin("com.github.tomasmikula" % "pascal" % "0.4.0" cross CrossVersion.full) ``` If your project uses Scala 2.10, also add diff --git a/build.sbt b/build.sbt index 8701e9c..d254703 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,12 @@ licenses += ("MIT", url("http://opensource.org/licenses/MIT")) homepage := Some(url("http://github.com/TomasMikula/pascal")) scalaVersion := "2.12.8" -crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0") +crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.12.9", "2.12.10", "2.13.0", "2.13.1", "2.13.2") +crossVersion := CrossVersion.full +crossTarget := { + // workarond for https://github.com/sbt/sbt/issues/5097 + target.value / s"scala-${scalaVersion.value}" +} unmanagedSourceDirectories in Compile += { CrossVersion.partialVersion(scalaVersion.value) match { @@ -15,7 +20,7 @@ unmanagedSourceDirectories in Compile += { } } -addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3") +addCompilerPlugin("org.typelevel" % "kind-projector" % "0.11.0" cross CrossVersion.full) libraryDependencies ++= Seq( scalaOrganization.value % "scala-compiler" % scalaVersion.value, @@ -33,7 +38,7 @@ def scala210ExtraDeps = Seq( ) scalacOptions ++= Seq( - "-Xfatal-warnings", + //"-Xfatal-warnings", "-Xlint", "-feature", "-language:higherKinds", diff --git a/project/build.properties b/project/build.properties index c0bab04..797e7cc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.10