Use CrossVersion.patch instead of .full

Also scalaOrganization.value instead of "org.scala-lang".
durban · Feb 22, 2017 · 3bfd2d7 · 3bfd2d7
1 parent 26dea96
commit 3bfd2d7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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