Skip to content

Commit ccf3e98

Browse files
alexarchambaultalexarchambault
committed
Switch to Scala 3-based scala-cli-signing
1 parent 50c1dcb commit ccf3e98

File tree

4 files changed

+36
-40
lines changed

4 files changed

+36
-40
lines changed

‎build.sc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ trait Options extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
509509

510510
def ivyDeps = super.ivyDeps() ++ Agg(
511511
Deps.bloopConfig,
512-
Deps.signingCliShared.exclude(("com.github.alexarchambault", "*"))
512+
Deps.signingCliShared
513513
)
514514
def compileIvyDeps = super.compileIvyDeps() ++ Seq(
515515
Deps.jsoniterMacros
@@ -639,14 +639,12 @@ trait CliOptions extends SbtModule with ScalaCliPublishModule {
639639
super.scalacOptions() ++ extraOptions
640640
}
641641
def ivyDeps = super.ivyDeps() ++ Agg(
642+
Deps.caseApp,
642643
Deps.jsoniterCore213,
643644
Deps.osLib,
644-
Deps.signingCli
645-
.exclude((organization, "config_2.13"))
646-
.exclude(("com.github.alexarchambault", "*"))
645+
Deps.signingCli.exclude((organization, "config_2.13"))
647646
)
648647
def compileIvyDeps = super.compileIvyDeps() ++ Seq(
649-
Deps.caseApp,
650648
Deps.jsoniterMacros
651649
)
652650
def scalaVersion = Scala.defaultInternal
@@ -762,9 +760,7 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
762760
Deps.metaconfigTypesafe,
763761
Deps.pythonNativeLibs,
764762
Deps.scalaPackager,
765-
Deps.signingCli
766-
.exclude((organization, "config_2.13"))
767-
.exclude(("com.github.alexarchambault", "*")),
763+
Deps.signingCli.exclude((organization, "config_2.13")),
768764
Deps.slf4jNop, // to silence jgit
769765
Deps.sttp
770766
)

‎project/deps.sc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ object Deps {
164164
def semanticDbScalac = ivy"org.scalameta:::semanticdb-scalac:${Versions.scalaMeta}"
165165
def shapeless = ivy"com.chuusai::shapeless:2.3.9"
166166
def signingCliShared =
167-
ivy"io.github.alexarchambault.scala-cli.signing:shared_2.13:${Versions.signingCli}"
168-
def signingCli = ivy"io.github.alexarchambault.scala-cli.signing:cli_2.13:${Versions.signingCli}"
167+
ivy"io.github.alexarchambault.scala-cli.signing::shared:${Versions.signingCli}"
168+
def signingCli = ivy"io.github.alexarchambault.scala-cli.signing::cli:${Versions.signingCli}"
169169
def slf4jNop = ivy"org.slf4j:slf4j-nop:2.0.3"
170170
// Force using of 2.13 - is there a better way?
171171
def snailgun(force213: Boolean = false) =

‎website/docs/reference/cli-options.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Add dependencies
171171

172172
### `--repository`
173173

174-
Aliases: `--repo`, `-r`
174+
Aliases: `-r`, `--repo`
175175

176176
Add repositories
177177

@@ -308,7 +308,7 @@ Custom path to the scalafmt configuration file.
308308

309309
### `--scalafmt-conf-str`
310310

311-
Aliases: `--scalafmt-config-str`, `--scalafmt-conf-snippet`
311+
Aliases: `--scalafmt-conf-snippet`, `--scalafmt-config-str`
312312

313313
Pass configuration as a string.
314314

@@ -344,7 +344,7 @@ Print help message and exit
344344

345345
### `--help-full`
346346

347-
Aliases: `--full-help`, `-help-full`, `-full-help`
347+
Aliases: `--full-help`, `-full-help`, `-help-full`
348348

349349
Print help message, including hidden options, and exit
350350

@@ -366,7 +366,7 @@ Show options for ScalaNative
366366

367367
### `--help-scaladoc`
368368

369-
Aliases: `--scaladoc-help`, `--doc-help`, `--help-doc`
369+
Aliases: `--doc-help`, `--help-doc`, `--scaladoc-help`
370370

371371
Show options for Scaladoc
372372

@@ -378,7 +378,7 @@ Show options for Scala REPL
378378

379379
### `--help-scalafmt`
380380

381-
Aliases: `--scalafmt-help`, `--fmt-help`, `--help-fmt`
381+
Aliases: `--fmt-help`, `--help-fmt`, `--scalafmt-help`
382382

383383
Show options for Scalafmt
384384

@@ -522,7 +522,7 @@ Specify which main class to run
522522

523523
### `--main-class-ls`
524524

525-
Aliases: `--main-class-list`, `--list-main-class`, `--list-main-classes`
525+
Aliases: `--list-main-class`, `--list-main-classes`, `--main-class-list`
526526

527527
List main classes available in the current context
528528

@@ -536,7 +536,7 @@ Available in commands:
536536

537537
### `--enable-markdown`
538538

539-
Aliases: `--md`, `--markdown`
539+
Aliases: `--markdown`, `--md`
540540

541541
[experimental] Enable markdown support.
542542

@@ -570,7 +570,7 @@ Generate a source JAR rather than an executable JAR
570570

571571
### `--doc`
572572

573-
Aliases: `--scaladoc`, `--javadoc`
573+
Aliases: `--javadoc`, `--scaladoc`
574574

575575
Generate a scaladoc JAR rather than an executable JAR
576576

@@ -804,7 +804,7 @@ Whether to build and publish source JARs
804804

805805
### `--doc`
806806

807-
Aliases: `--scaladoc`, `--javadoc`
807+
Aliases: `--javadoc`, `--scaladoc`
808808

809809
Whether to build and publish doc JARs
810810

@@ -1225,7 +1225,7 @@ Available in commands:
12251225

12261226
### `--scalac-option`
12271227

1228-
Aliases: `--scala-opt`, `-O`, `--scala-option`
1228+
Aliases: `-O`, `--scala-opt`, `--scala-option`
12291229

12301230
Add a `scalac` option. Note that options starting with `-g`, `-language`, `-opt`, `-P`, `-target`, `-V`, `-W`, `-X`, and `-Y` are assumed to be Scala compiler options and don't require to be passed after `-O` or `--scalac-option`.
12311231

@@ -1292,20 +1292,20 @@ Available in commands:
12921292

12931293
### `--scala-version`
12941294

1295-
Aliases: `--scala`, `-S`
1295+
Aliases: `-S`, `--scala`
12961296

12971297
Set the Scala version (3.2.1 by default)
12981298

12991299
### `--scala-binary-version`
13001300

1301-
Aliases: `--scala-binary`, `--scala-bin`, `-B`
1301+
Aliases: `-B`, `--scala-bin`, `--scala-binary`
13021302

13031303
[Internal]
13041304
Set the Scala binary version
13051305

13061306
### `--extra-jars`
13071307

1308-
Aliases: `--jar`, `--jars`, `--extra-jar`, `--class`, `--extra-class`, `--classes`, `--extra-classes`, `-classpath`, `-cp`, `--classpath`, `--class-path`, `--extra-class-path`
1308+
Aliases: `--class`, `--class-path`, `--classes`, `--classpath`, `-classpath`, `-cp`, `--extra-class`, `--extra-class-path`, `--extra-classes`, `--extra-jar`, `--jar`, `--jars`
13091309

13101310
Add extra JARs and compiled classes to the class path
13111311

@@ -1317,7 +1317,7 @@ Add extra JARs in the compilaion class path. Mainly using to run code in managed
13171317

13181318
### `--extra-source-jars`
13191319

1320-
Aliases: `--source-jar`, `--source-jars`, `--extra-source-jar`
1320+
Aliases: `--extra-source-jar`, `--source-jar`, `--source-jars`
13211321

13221322
Add extra source JARs
13231323

@@ -1359,7 +1359,7 @@ Add dependency for stubs needed to make $ivy and $dep imports to work.
13591359
[Internal]
13601360
### `--compilation-output`
13611361

1362-
Aliases: `--output-directory`, `-d`, `--destination`, `--compile-output`, `--compile-out`
1362+
Aliases: `--compile-out`, `--compile-output`, `-d`, `--destination`, `--output-directory`
13631363

13641364
Copy compilation results to output directory using either relative or absolute path
13651365

@@ -1377,7 +1377,7 @@ Allows to execute a passed string as a Scala script
13771377

13781378
### `--execute-script`
13791379

1380-
Aliases: `--execute-scala-script`, `--execute-sc`, `-e`
1380+
Aliases: `-e`, `--execute-sc`, `--execute-scala-script`
13811381

13821382
[Internal]
13831383
A synonym to --script-snippet, which defaults the sub-command to `run` when no sub-command is passed explicitly
@@ -1610,7 +1610,7 @@ Available in commands:
16101610

16111611
### `--working-directory`
16121612

1613-
Aliases: `--working-dir`, `--dir`
1613+
Aliases: `--dir`, `--working-dir`
16141614

16151615
[Internal]
16161616
### Bloop start options

‎website/docs/reference/scala-command/cli-options.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Add dependencies
143143

144144
### `--repository`
145145

146-
Aliases: `--repo`, `-r`
146+
Aliases: `-r`, `--repo`
147147

148148
Add repositories
149149

@@ -252,7 +252,7 @@ Custom path to the scalafmt configuration file.
252252

253253
### `--scalafmt-conf-str`
254254

255-
Aliases: `--scalafmt-config-str`, `--scalafmt-conf-snippet`
255+
Aliases: `--scalafmt-conf-snippet`, `--scalafmt-config-str`
256256

257257
Pass configuration as a string.
258258

@@ -288,7 +288,7 @@ Print help message and exit
288288

289289
### `--help-full`
290290

291-
Aliases: `--full-help`, `-help-full`, `-full-help`
291+
Aliases: `--full-help`, `-full-help`, `-help-full`
292292

293293
Print help message, including hidden options, and exit
294294

@@ -310,7 +310,7 @@ Show options for ScalaNative
310310

311311
### `--help-scaladoc`
312312

313-
Aliases: `--scaladoc-help`, `--doc-help`, `--help-doc`
313+
Aliases: `--doc-help`, `--help-doc`, `--scaladoc-help`
314314

315315
Show options for Scaladoc
316316

@@ -322,7 +322,7 @@ Show options for Scala REPL
322322

323323
### `--help-scalafmt`
324324

325-
Aliases: `--scalafmt-help`, `--fmt-help`, `--help-fmt`
325+
Aliases: `--fmt-help`, `--help-fmt`, `--scalafmt-help`
326326

327327
Show options for Scalafmt
328328

@@ -466,7 +466,7 @@ Specify which main class to run
466466

467467
### `--main-class-ls`
468468

469-
Aliases: `--main-class-list`, `--list-main-class`, `--list-main-classes`
469+
Aliases: `--list-main-class`, `--list-main-classes`, `--main-class-list`
470470

471471
List main classes available in the current context
472472

@@ -641,7 +641,7 @@ Available in commands:
641641

642642
### `--scalac-option`
643643

644-
Aliases: `--scala-opt`, `-O`, `--scala-option`
644+
Aliases: `-O`, `--scala-opt`, `--scala-option`
645645

646646
Add a `scalac` option. Note that options starting with `-g`, `-language`, `-opt`, `-P`, `-target`, `-V`, `-W`, `-X`, and `-Y` are assumed to be Scala compiler options and don't require to be passed after `-O` or `--scalac-option`.
647647

@@ -675,20 +675,20 @@ Available in commands:
675675

676676
### `--scala-version`
677677

678-
Aliases: `--scala`, `-S`
678+
Aliases: `-S`, `--scala`
679679

680680
Set the Scala version (3.2.1 by default)
681681

682682
### `--scala-binary-version`
683683

684-
Aliases: `--scala-binary`, `--scala-bin`, `-B`
684+
Aliases: `-B`, `--scala-bin`, `--scala-binary`
685685

686686
[Internal]
687687
Set the Scala binary version
688688

689689
### `--extra-jars`
690690

691-
Aliases: `--jar`, `--jars`, `--extra-jar`, `--class`, `--extra-class`, `--classes`, `--extra-classes`, `-classpath`, `-cp`, `--classpath`, `--class-path`, `--extra-class-path`
691+
Aliases: `--class`, `--class-path`, `--classes`, `--classpath`, `-classpath`, `-cp`, `--extra-class`, `--extra-class-path`, `--extra-classes`, `--extra-jar`, `--jar`, `--jars`
692692

693693
Add extra JARs and compiled classes to the class path
694694

@@ -700,7 +700,7 @@ Add extra JARs in the compilaion class path. Mainly using to run code in managed
700700

701701
### `--extra-source-jars`
702702

703-
Aliases: `--source-jar`, `--source-jars`, `--extra-source-jar`
703+
Aliases: `--extra-source-jar`, `--source-jar`, `--source-jars`
704704

705705
Add extra source JARs
706706

@@ -742,7 +742,7 @@ Add dependency for stubs needed to make $ivy and $dep imports to work.
742742
[Internal]
743743
### `--compilation-output`
744744

745-
Aliases: `--output-directory`, `-d`, `--destination`, `--compile-output`, `--compile-out`
745+
Aliases: `--compile-out`, `--compile-output`, `-d`, `--destination`, `--output-directory`
746746

747747
Copy compilation results to output directory using either relative or absolute path
748748

@@ -760,7 +760,7 @@ Allows to execute a passed string as a Scala script
760760

761761
### `--execute-script`
762762

763-
Aliases: `--execute-scala-script`, `--execute-sc`, `-e`
763+
Aliases: `-e`, `--execute-sc`, `--execute-scala-script`
764764

765765
[Internal]
766766
A synonym to --script-snippet, which defaults the sub-command to `run` when no sub-command is passed explicitly

0 commit comments

Comments
 (0)