From 03419ce375523cc2797faa34915750853e1053ed Mon Sep 17 00:00:00 2001
From: Billy Autrey <40704452+BillyAutrey@users.noreply.github.com>
Date: Sat, 12 Oct 2024 08:02:44 -0500
Subject: [PATCH] Move PluginCompat to give access to package.scala

---
 .../com/typesafe/sbt/{web => }/PluginCompat.scala          | 7 ++++---
 .../scala-3/com/typesafe/sbt/{web => }/PluginCompat.scala  | 4 ++--
 .../scala/com/typesafe/sbt/web/incremental/OpCache.scala   | 2 +-
 .../scala/com/typesafe/sbt/web/incremental/package.scala   | 2 +-
 src/main/scala/com/typesafe/sbt/web/package.scala          | 4 +++-
 5 files changed, 11 insertions(+), 8 deletions(-)
 rename src/main/scala-2.12/com/typesafe/sbt/{web => }/PluginCompat.scala (86%)
 rename src/main/scala-3/com/typesafe/sbt/{web => }/PluginCompat.scala (93%)

diff --git a/src/main/scala-2.12/com/typesafe/sbt/web/PluginCompat.scala b/src/main/scala-2.12/com/typesafe/sbt/PluginCompat.scala
similarity index 86%
rename from src/main/scala-2.12/com/typesafe/sbt/web/PluginCompat.scala
rename to src/main/scala-2.12/com/typesafe/sbt/PluginCompat.scala
index 47f84cd..7d60e01 100644
--- a/src/main/scala-2.12/com/typesafe/sbt/web/PluginCompat.scala
+++ b/src/main/scala-2.12/com/typesafe/sbt/PluginCompat.scala
@@ -1,11 +1,12 @@
-package com.typesafe.sbt.web
+package com.typesafe.sbt
 
-import java.nio.file.{ Path => NioPath }
 import sbt.*
 import sbt.Keys.Classpath
 import xsbti.FileConverter
 
-private[web] object PluginCompat {
+import java.nio.file.Path as NioPath
+
+private[sbt] object PluginCompat {
   type FileRef = java.io.File
   type Out = java.io.File
 
diff --git a/src/main/scala-3/com/typesafe/sbt/web/PluginCompat.scala b/src/main/scala-3/com/typesafe/sbt/PluginCompat.scala
similarity index 93%
rename from src/main/scala-3/com/typesafe/sbt/web/PluginCompat.scala
rename to src/main/scala-3/com/typesafe/sbt/PluginCompat.scala
index 5b179cb..7a58f40 100644
--- a/src/main/scala-3/com/typesafe/sbt/web/PluginCompat.scala
+++ b/src/main/scala-3/com/typesafe/sbt/PluginCompat.scala
@@ -1,4 +1,4 @@
-package com.typesafe.sbt.web
+package com.typesafe.sbt
 
 import java.nio.file.{ Path => NioPath }
 import java.io.{ File => IoFile }
@@ -6,7 +6,7 @@ import sbt.*
 import sbt.Keys.Classpath
 import xsbti.{ FileConverter, HashedVirtualFileRef, VirtualFile }
 
-private[web] object PluginCompat:
+private[sbt] object PluginCompat:
   type FileRef = HashedVirtualFileRef
   type Out = VirtualFile
 
diff --git a/src/main/scala/com/typesafe/sbt/web/incremental/OpCache.scala b/src/main/scala/com/typesafe/sbt/web/incremental/OpCache.scala
index 4a46595..b5d3003 100644
--- a/src/main/scala/com/typesafe/sbt/web/incremental/OpCache.scala
+++ b/src/main/scala/com/typesafe/sbt/web/incremental/OpCache.scala
@@ -3,7 +3,7 @@
  */
 package com.typesafe.sbt.web.incremental
 
-import com.typesafe.sbt.web.PluginCompat.toSet
+import com.typesafe.sbt.PluginCompat.toSet
 import java.io.File
 import sbt.Hash
 
diff --git a/src/main/scala/com/typesafe/sbt/web/incremental/package.scala b/src/main/scala/com/typesafe/sbt/web/incremental/package.scala
index 476e502..4da2feb 100644
--- a/src/main/scala/com/typesafe/sbt/web/incremental/package.scala
+++ b/src/main/scala/com/typesafe/sbt/web/incremental/package.scala
@@ -4,7 +4,7 @@
 package com.typesafe.sbt.web
 
 import java.io.File
-import PluginCompat.toSet
+import com.typesafe.sbt.PluginCompat.toSet
 
 /**
  * The incremental task API lets tasks run more quickly when they are called more than once. The idea is to do less work
diff --git a/src/main/scala/com/typesafe/sbt/web/package.scala b/src/main/scala/com/typesafe/sbt/web/package.scala
index 1dc1402..831efc9 100644
--- a/src/main/scala/com/typesafe/sbt/web/package.scala
+++ b/src/main/scala/com/typesafe/sbt/web/package.scala
@@ -1,5 +1,7 @@
 package com.typesafe.sbt
 
+import PluginCompat.FileRef
+
 import java.io.File
 
 package object web {
@@ -12,5 +14,5 @@ package object web {
   /**
    * A function for possibly selecting a single file from a sequence.
    */
-  type Deduplicator = Seq[File] => Option[File]
+  type Deduplicator = Seq[FileRef] => Option[FileRef]
 }