Merge pull request #230 from anatoliykmetyuk/sbt2-compat-plugin

Replace partially compat layer with sbt2-compat plugin

Author: eed3si9n

.gitignore

@@ -6,3 +6,10 @@ boot/
 .scala_dependencies
 /.idea
 /.bsp
+
+.metals/
+.vscode/
+.cursor/
+.bloop/
+metals.sbt
+.java-version

build.sbt

@@ -42,6 +42,7 @@ lazy val plugin = (project in file("sbt-pgp"))
   .settings(
     name := "sbt-pgp",
     libraryDependencies += gigahorseOkhttp.value,
+    addSbtPlugin("com.github.sbt" % "sbt2-compat" % "0.1.0"),
     publishLocal := publishLocal.dependsOn((library / publishLocal)).value,
     scriptedBufferLog := false,
     scriptedLaunchOpts += s"-Dproject.version=${version.value}",

sbt-pgp/src/main/scala-2.12/Compat.scala

@@ -65,14 +65,6 @@ object Compat {
     }
   )
 
-  def toFile(x: File, c: xsbti.FileConverter): File = x
-
-  def credentialForHost(cs: Seq[Credentials], host: String) =
-    Credentials.forHost(cs, host)
-
-  implicit class DefOp(singleton: Def.type) {
-    def uncached[A1](a: A1): A1 = a
-  }
   @meta.getter
   class cacheLevel(
       include: Array[String]

sbt-pgp/src/main/scala-3/Compat.scala

@@ -67,11 +67,5 @@ object Compat {
     }
   )
 
-  def toFile(vf: xsbti.HashedVirtualFileRef, c: xsbti.FileConverter): File =
-    c.toPath(vf).toFile()
-
-  def credentialForHost(cs: Seq[Credentials], host: String) =
-    sbt.internal.librarymanagement.ivy.IvyCredentials.forHost(cs, host)
-
   type cacheLevel = sbt.util.cacheLevel
 }

sbt-pgp/src/main/scala/com/jsuereth/sbtpgp/PgpSettings.scala

@@ -5,6 +5,7 @@ import Keys._
 import SbtHelpers._
 import PgpKeys._
 import sbt.sbtpgp.Compat, Compat._
+import sbtcompat.PluginCompat._
 
 /**
  * SBT Settings for doing PGP security tasks.  Signing, verifying, etc.
@@ -144,15 +145,15 @@ object PgpSettings {
     }).value,
     publishSignedConfiguration := {
       val _ = pgpMakeIvy.value
-      val c = fileConverter.value
+      implicit val conv: xsbti.FileConverter = fileConverter.value
       Classpaths.publishConfig(
         publishMavenStyle.value,
         deliverPattern(crossTarget.value),
         if (isSnapshot.value) "integration" else "release",
         ivyConfigurations.value.map(c => ConfigRef(c.name)).toVector,
         PgpKeys.signedArtifacts.value.toVector.map {
           case (a, x) =>
-            a -> toFile(x, c)
+            a -> toFile(x)
         },
         checksums = (publish / checksums).value.toVector,
         resolverName = Classpaths.getPublishTo(publishTo.value).name,
@@ -163,15 +164,15 @@ object PgpSettings {
     publishSigned := publishSignedTask(publishSignedConfiguration, deliver).value,
     publishLocalSignedConfiguration := {
       val _ = deliverLocal.value
-      val c = fileConverter.value
+      implicit val conv: xsbti.FileConverter = fileConverter.value
       Classpaths.publishConfig(
         publishMavenStyle.value,
         deliverPattern(crossTarget.value),
         if (isSnapshot.value) "integration" else "release",
         ivyConfigurations.value.map(c => ConfigRef(c.name)).toVector,
         PgpKeys.signedArtifacts.value.toVector.map {
           case (a, x) =>
-            a -> toFile(x, c)
+            a -> toFile(x)
         },
         (publishLocal / checksums).value.toVector,
         resolverName = "local",

sbt-pgp/src/main/scala/com/jsuereth/sbtpgp/SbtPgp.scala

@@ -2,6 +2,7 @@ package com.jsuereth.sbtpgp
 
 import sbt.{ given, * }
 import sbt.sbtpgp.Compat._
+import sbtcompat.PluginCompat._
 
 /**
  * This class is used to control what we expose to