Skip to content

Commit 14480bf

Browse files
Drop config file support
- stop watching conf files for changes - stop reading conf files - stop preprocessing config files - remove config reference doc - remove config parsing stuff - remove config file input
1 parent d036b97 commit 14480bf

File tree

20 files changed

+3
-457
lines changed

20 files changed

+3
-457
lines changed

build.sc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ class Build(val crossScalaVersion: String)
156156
Deps.nativeTools,
157157
Deps.osLib,
158158
Deps.pprint,
159-
Deps.pureconfig,
160159
Deps.scalaJsEnvNodeJs,
161160
Deps.scalaJsLinkerInterface,
162161
Deps.scalaJsTestAdapter,

modules/build/src/main/scala/scala/build/Build.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,7 @@ object Build {
316316
val isHidden = relPath.segments.exists(_.startsWith("."))
317317
def isScalaFile = relPath.last.endsWith(".sc") || relPath.last.endsWith(".scala")
318318
def isJavaFile = relPath.last.endsWith(".java")
319-
def isConfFile = relPath.last == "scala.conf" || relPath.last.endsWith(".scala.conf")
320-
!isHidden && (isScalaFile || isJavaFile || isConfFile)
319+
!isHidden && (isScalaFile || isJavaFile)
321320
case _ => _ => true
322321
}
323322

modules/build/src/main/scala/scala/build/Inputs.scala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ final case class Inputs(
3535
Inputs.ScalaFile(d.path, p.subRelativeTo(d.path))
3636
case p if p.last.endsWith(".sc") =>
3737
Inputs.Script(d.path, p.subRelativeTo(d.path))
38-
case p if p.last == "scala.conf" || p.last.endsWith(".scala.conf") =>
39-
Inputs.ConfigFile(p)
4038
}
4139
.toVector
4240
case _: Inputs.ResourceDirectory =>
@@ -74,8 +72,6 @@ final case class Inputs(
7472
Inputs.ScalaFile(d.path, p.subRelativeTo(d.path))
7573
case p if p.last.endsWith(".sc") =>
7674
Inputs.Script(d.path, p.subRelativeTo(d.path))
77-
case p if p.last == "scala.conf" || p.last.endsWith(".scala.conf") =>
78-
Inputs.ConfigFile(p)
7975
}
8076
.toVector
8177
case _: Inputs.ResourceDirectory =>
@@ -142,8 +138,6 @@ object Inputs {
142138
final case class Directory(path: os.Path) extends OnDisk with Compiled
143139
final case class ResourceDirectory(path: os.Path) extends OnDisk
144140

145-
final case class ConfigFile(path: os.Path) extends SingleFile
146-
147141
final case class VirtualScript(content: Array[Byte], source: String, wrapperPath: os.SubPath)
148142
extends Virtual with AnyScalaFile
149143
final case class VirtualScalaFile(content: Array[Byte], source: String)
@@ -161,7 +155,6 @@ object Inputs {
161155
case _: Inputs.JavaFile => "java:"
162156
case _: Inputs.ScalaFile => "scala:"
163157
case _: Inputs.Script => "sc:"
164-
case _: Inputs.ConfigFile => "config:"
165158
}
166159
Iterator(prefix, elem.path.toString, "\n").map(bytes)
167160
case v: Inputs.Virtual =>

modules/build/src/main/scala/scala/build/Sources.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ object Sources {
3939
Seq(
4040
ScriptPreprocessor(codeWrapper),
4141
JavaPreprocessor,
42-
ConfigPreprocessor,
4342
ScalaPreprocessor
4443
)
4544
}

modules/build/src/main/scala/scala/build/bsp/BspImpl.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@ final class BspImpl(
168168
lazy val isHidden = relPath.segments.exists(_.startsWith("."))
169169
def isScalaFile = relPath.last.endsWith(".sc") || relPath.last.endsWith(".scala")
170170
def isJavaFile = relPath.last.endsWith(".java")
171-
def isConfFile = relPath.last == "scala.conf" || relPath.last.endsWith(".scala.conf")
172-
newOrDeletedFile && !isHidden && (isScalaFile || isJavaFile || isConfFile)
171+
newOrDeletedFile && !isHidden && (isScalaFile || isJavaFile)
173172
}
174173
val watcher0 = watcher.newWatcher()
175174
watcher0.register(dir.path.toNIO, Int.MaxValue)

modules/build/src/main/scala/scala/build/config/ConfigFormat.scala

Lines changed: 0 additions & 73 deletions
This file was deleted.

modules/build/src/main/scala/scala/build/config/Dependencies.scala

Lines changed: 0 additions & 14 deletions
This file was deleted.

modules/build/src/main/scala/scala/build/config/Java.scala

Lines changed: 0 additions & 18 deletions
This file was deleted.

modules/build/src/main/scala/scala/build/config/Scala.scala

Lines changed: 0 additions & 16 deletions
This file was deleted.

modules/build/src/main/scala/scala/build/config/ScalaJs.scala

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)