@@ -8,22 +8,22 @@ import dependency.AnyDependency
8
8
import dependency .parser .DependencyParser
9
9
10
10
import java .io .{File , InputStream }
11
-
12
- import scala .build ._
11
+ import scala .build .*
13
12
import scala .build .blooprifle .BloopRifleConfig
14
13
import scala .build .compiler .{BloopCompilerMaker , ScalaCompilerMaker , SimpleScalaCompilerMaker }
15
14
import scala .build .errors .BuildException
16
15
import scala .build .interactive .Interactive
17
16
import scala .build .interactive .Interactive .{InteractiveAsk , InteractiveNop }
18
- import scala .build .internal .CsLoggerUtil ._
17
+ import scala .build .internal .CsLoggerUtil .*
19
18
import scala .build .internal .{Constants , FetchExternalBinary , OsLibc , Util }
20
19
import scala .build .options .{Platform , ScalacOpt , ShadowingSeq }
21
- import scala .build .{ options => bo }
20
+ import scala .build .options as bo
22
21
import scala .cli .commands .ScalaJsOptions
23
- import scala .cli .commands .util .CommonOps ._
24
- import scala .cli .commands .util .SharedCompilationServerOptionsUtil ._
22
+ import scala .cli .commands .util .CommonOps .*
23
+ import scala .cli .commands .util .SharedCompilationServerOptionsUtil .*
25
24
import scala .cli .config .{ConfigDb , Keys }
26
- import scala .concurrent .duration ._
25
+ import scala .concurrent .ExecutionContextExecutorService
26
+ import scala .concurrent .duration .*
27
27
import scala .util .Properties
28
28
import scala .util .control .NonFatal
29
29
@@ -65,7 +65,7 @@ object SharedOptionsUtil extends CommandHelpers {
65
65
logger.message(s " WARNING: provided resource directory path doesn't exist: $path" )
66
66
path
67
67
}
68
- .map(Inputs .ResourceDirectory (_) )
68
+ .map(Inputs .ResourceDirectory )
69
69
val maybeInputs = Inputs (
70
70
args,
71
71
Os .pwd,
@@ -94,7 +94,7 @@ object SharedOptionsUtil extends CommandHelpers {
94
94
implicit class SharedOptionsOps (v : SharedOptions ) {
95
95
import v ._
96
96
97
- def logger = logging.logger
97
+ def logger : Logger = logging.logger
98
98
99
99
private def scalaJsOptions (opts : ScalaJsOptions ): options.ScalaJsOptions = {
100
100
import opts ._
@@ -168,11 +168,11 @@ object SharedOptionsUtil extends CommandHelpers {
168
168
scalac.scalacOption
169
169
.filter(_.nonEmpty)
170
170
.map(ScalacOpt (_))
171
- .map(Positioned .commandLine(_) )
171
+ .map(Positioned .commandLine)
172
172
),
173
173
compilerPlugins =
174
174
SharedOptionsUtil .parseDependencies(
175
- dependencies.compilerPlugin.map(Positioned .none(_) ),
175
+ dependencies.compilerPlugin.map(Positioned .none),
176
176
ignoreErrors
177
177
),
178
178
platform = platformOpt.map(o => Positioned (List (Position .CommandLine ()), o))
@@ -205,7 +205,7 @@ object SharedOptionsUtil extends CommandHelpers {
205
205
extraRepositories = dependencies.repository.map(_.trim).filter(_.nonEmpty),
206
206
extraDependencies = ShadowingSeq .from(
207
207
SharedOptionsUtil .parseDependencies(
208
- dependencies.dependency.map(Positioned .none(_) ),
208
+ dependencies.dependency.map(Positioned .none),
209
209
ignoreErrors
210
210
)
211
211
)
@@ -267,7 +267,7 @@ object SharedOptionsUtil extends CommandHelpers {
267
267
def configDb : ConfigDb = ConfigDb .open(v).orExit(logger)
268
268
269
269
def downloadJvm (jvmId : String , options : bo.BuildOptions ): String = {
270
- implicit val ec = options.finalCache.ec
270
+ implicit val ec : ExecutionContextExecutorService = options.finalCache.ec
271
271
val javaHomeManager = options.javaHomeManager
272
272
.withMessage(s " Downloading JVM $jvmId" )
273
273
val logger = javaHomeManager.cache
@@ -352,7 +352,7 @@ object SharedOptionsUtil extends CommandHelpers {
352
352
! Properties .isWin
353
353
)
354
354
355
- def strictBloopJsonCheckOrDefault =
355
+ def strictBloopJsonCheckOrDefault : Boolean =
356
356
strictBloopJsonCheck.getOrElse(bo.InternalOptions .defaultStrictBloopJsonCheck)
357
357
}
358
358
0 commit comments