@@ -61,9 +61,6 @@ object Build {
61
61
}
62
62
val dottyNonBootstrappedVersion = dottyVersion + " -nonbootstrapped"
63
63
64
- val DRONE_MEM = " dotty.drone.mem"
65
-
66
-
67
64
val agentOptions = List (
68
65
// "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
69
66
// "-agentpath:/home/dark/opt/yjp-2013-build-13072/bin/linux-x86-64/libyjpagent.so"
@@ -133,19 +130,13 @@ object Build {
133
130
134
131
// Settings shared globally (scoped in Global). Used in build.sbt
135
132
lazy val globalSettings = Def .settings(
136
- // Override `runCode` from sbt-dotty to use the language-server and
137
- // vscode extension from the source repository of dotty instead of a
138
- // published version.
139
- runCode := (run in `dotty-language-server`).toTask(" " ).value,
140
-
141
133
onLoad := (onLoad in Global ).value andThen { state =>
142
134
def exists (submodule : String ) = {
143
135
val path = Paths .get(submodule)
144
136
Files .exists(path) && {
145
137
val fileStream = Files .list(path)
146
- val nonEmpty = fileStream.iterator().hasNext()
147
- fileStream.close()
148
- nonEmpty
138
+ try fileStream.iterator().hasNext()
139
+ finally fileStream.close()
149
140
}
150
141
}
151
142
@@ -546,7 +537,7 @@ object Build {
546
537
} yield " -Xbootclasspath/p:" + path
547
538
548
539
val ci_build = // propagate if this is a ci build
549
- sys.props.get(DRONE_MEM ) match {
540
+ sys.props.get(" dotty.drone.mem " ) match {
550
541
case Some (prop) => List (" -Xmx" + prop)
551
542
case _ => List ()
552
543
}
0 commit comments