Skip to content

Commit 29bc194

Browse files
Merge pull request #1388 from alexarchambault/config-proxy-keys
Add HTTP proxy-related keys in config module
2 parents 06f07dc + f6266fe commit 29bc194

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

modules/config/src/main/scala/scala/cli/config/Key.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import scala.cli.config.Util._
77

88
/** A configuration key
99
*/
10-
sealed abstract class Key[T] {
10+
abstract class Key[T] {
1111

1212
/** Key prefix, such as "foo.a" in "foo.a.b" */
1313
def prefix: Seq[String]

modules/config/src/main/scala/scala/cli/config/Keys.scala

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ object Keys {
1919

2020
val interactive = new Key.BooleanEntry(Seq.empty, "interactive")
2121

22+
val proxyAddress = new Key.StringEntry(Seq("httpProxy"), "address")
23+
val proxyUser = new Key.PasswordEntry(Seq("httpProxy"), "user")
24+
val proxyPassword = new Key.PasswordEntry(Seq("httpProxy"), "password")
25+
2226
// setting indicating if the global interactive mode was suggested
2327
val globalInteractiveWasSuggested = new Key.BooleanEntry(Seq.empty, "interactive-was-suggested")
2428

@@ -34,7 +38,10 @@ object Keys {
3438
pgpSecretKeyPassword,
3539
pgpPublicKey,
3640
sonatypeUser,
37-
sonatypePassword
41+
sonatypePassword,
42+
proxyAddress,
43+
proxyUser,
44+
proxyPassword
3845
)
3946

4047
lazy val map: Map[String, Key[_]] = all.map(e => e.fullName -> e).toMap

0 commit comments

Comments
 (0)