Move PluginCompat to give access to package.scala

sbt · Oct 12, 2024 · 03419ce · 03419ce
1 parent bfe241e
commit 03419ce
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/...2/com/typesafe/sbt/web/PluginCompat.scala → ...-2.12/com/typesafe/sbt/PluginCompat.scala b/...2/com/typesafe/sbt/web/PluginCompat.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/...3/com/typesafe/sbt/web/PluginCompat.scala → ...ala-3/com/typesafe/sbt/PluginCompat.scala b/...3/com/typesafe/sbt/web/PluginCompat.scala → ...ala-3/com/typesafe/sbt/PluginCompat.scala
@@ -1,12 +1,12 @@
-package com.typesafe.sbt.web
+package com.typesafe.sbt
 
 import java.nio.file.{ Path => NioPath }
 import java.io.{ File => IoFile }
 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
@@ -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
@@ -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
@@ -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]
 }