Build plugins with sbt 1.3.x

coursier · May 14, 2020 · 1c39749 · 1c39749
1 parent b6fb4da
commit 1c39749
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/modules/sbt-lm-coursier/src/main/scala/sbt/hack/Foo.scala b/modules/sbt-lm-coursier/src/main/scala/sbt/hack/Foo.scala
@@ -67,6 +67,8 @@ object Foo {
         ewo = evictionOptions,
         mavenStyle = publishMavenStyle.value,
         compatWarning = compatibilityWarningOptions.value,
+        includeCallers = false,
+        includeDetails = false,
         log = s.log
       )
     } catch {
@@ -90,8 +92,6 @@ object Foo {
             ewo: EvictionWarningOptions,
             mavenStyle: Boolean,
             compatWarning: CompatibilityWarningOptions,
-            includeCallers: Boolean,
-            includeDetails: Boolean,
             log: Logger
           ): UpdateReport
         }].cachedUpdate(
@@ -110,8 +110,6 @@ object Foo {
           ewo = evictionOptions,
           mavenStyle = publishMavenStyle.value,
           compatWarning = compatibilityWarningOptions.value,
-          includeCallers = false,
-          includeDetails = false,
           log = s.log
         )
     }

diff --git a/project/Settings.scala b/project/Settings.scala
@@ -11,7 +11,7 @@ object Settings {
 
   def scala212 = "2.12.10"
 
-  def targetSbtVersion = "1.2.8"
+  def targetSbtVersion = "1.3.1"
 
   private lazy val isAtLeastScala213 = Def.setting {
     import Ordering.Implicits._
@@ -56,8 +56,9 @@ object Settings {
         "-Xmx1024M",
         "-Dplugin.name=" + name.value,
         "-Dplugin.version=" + version.value,
-        "-Dsbttest.base=" + (sourceDirectory.value / "sbt-test").getAbsolutePath,
-        "-Dcoursier.sbt-launcher.add-plugin=false"
+        "-Dcoursier.sbt-launcher.add-plugin=true",
+        "-Dcoursier.sbt-launcher.plugin=" + name.value,
+        "-Dcoursier.sbt-launcher.plugin-version=" + version.value
       ),
       scriptedBufferLog := false,
       sbtPlugin := true,