From 3bfd2d758945e01aa4d26f5ff8f3613c650a60dd Mon Sep 17 00:00:00 2001 From: Daniel Urban Date: Wed, 22 Feb 2017 19:53:43 +0100 Subject: [PATCH] Use CrossVersion.patch instead of .full Also scalaOrganization.value instead of "org.scala-lang". --- build.sbt | 5 ++--- plugin/src/sbt-test/seals-plugin/example/build.sbt | 2 +- plugin/src/sbt-test/seals-plugin/example/changes/v010.sbt | 2 +- plugin/src/sbt-test/seals-plugin/example/changes/v020.sbt | 2 +- plugin/src/sbt-test/seals-plugin/test0/build.sbt | 2 +- plugin/src/sbt-test/seals-plugin/test1-change-sch/build.sbt | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 2af2fa8..e2329f8 100644 --- a/build.sbt +++ b/build.sbt @@ -124,12 +124,11 @@ lazy val lawsSettings = Seq[Setting[_]]( ) lazy val checkerSettings = Seq[Setting[_]]( - // FIXME: use scalaOrganization (?) - libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value + libraryDependencies += scalaOrganization.value % "scala-compiler" % scalaVersion.value ) lazy val macroParadiseSettings = Seq[Setting[_]]( - addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full) + addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.patch) ) lazy val sbtPluginSettings = scriptedSettings ++ Seq[Setting[_]]( diff --git a/plugin/src/sbt-test/seals-plugin/example/build.sbt b/plugin/src/sbt-test/seals-plugin/example/build.sbt index b9cbbb2..13464e9 100644 --- a/plugin/src/sbt-test/seals-plugin/example/build.sbt +++ b/plugin/src/sbt-test/seals-plugin/example/build.sbt @@ -18,7 +18,7 @@ lazy val proto = project .settings(name := "example-proto") .settings(commonSettings) .settings( - addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full), + addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.patch), mimaPreviousArtifacts := Set(organization.value %% name.value % "0.1.0"), sealsSchemaPackages += "com.example.proto" ) diff --git a/plugin/src/sbt-test/seals-plugin/example/changes/v010.sbt b/plugin/src/sbt-test/seals-plugin/example/changes/v010.sbt index e7dbd71..f2cc9e0 100644 --- a/plugin/src/sbt-test/seals-plugin/example/changes/v010.sbt +++ b/plugin/src/sbt-test/seals-plugin/example/changes/v010.sbt @@ -18,7 +18,7 @@ lazy val proto = project .settings(name := "example-proto") .settings(commonSettings) .settings( - addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full), + addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.patch), mimaPreviousArtifacts := Set(organization.value %% name.value % "0.1.0"), sealsSchemaPackages += "com.example.proto" ) diff --git a/plugin/src/sbt-test/seals-plugin/example/changes/v020.sbt b/plugin/src/sbt-test/seals-plugin/example/changes/v020.sbt index b9cbbb2..13464e9 100644 --- a/plugin/src/sbt-test/seals-plugin/example/changes/v020.sbt +++ b/plugin/src/sbt-test/seals-plugin/example/changes/v020.sbt @@ -18,7 +18,7 @@ lazy val proto = project .settings(name := "example-proto") .settings(commonSettings) .settings( - addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full), + addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.patch), mimaPreviousArtifacts := Set(organization.value %% name.value % "0.1.0"), sealsSchemaPackages += "com.example.proto" ) diff --git a/plugin/src/sbt-test/seals-plugin/test0/build.sbt b/plugin/src/sbt-test/seals-plugin/test0/build.sbt index 426a565..424243e 100644 --- a/plugin/src/sbt-test/seals-plugin/test0/build.sbt +++ b/plugin/src/sbt-test/seals-plugin/test0/build.sbt @@ -24,7 +24,7 @@ scalaVersion := "2.11.8" crossScalaVersions := Seq(scalaVersion.value, "2.12.1") -addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full) +addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.patch) libraryDependencies += "io.sigs" %% "seals-core" % "0.1.0-SNAPSHOT" // TODO: don't hardcode version diff --git a/plugin/src/sbt-test/seals-plugin/test1-change-sch/build.sbt b/plugin/src/sbt-test/seals-plugin/test1-change-sch/build.sbt index 334610d..67dd36b 100644 --- a/plugin/src/sbt-test/seals-plugin/test1-change-sch/build.sbt +++ b/plugin/src/sbt-test/seals-plugin/test1-change-sch/build.sbt @@ -24,7 +24,7 @@ scalaVersion := "2.11.8" crossScalaVersions := Seq(scalaVersion.value, "2.12.1") -addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full) +addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.patch) libraryDependencies += "io.sigs" %% "seals-core" % "0.1.0-SNAPSHOT" // TODO: don't hardcode version