Skip to content

Commit

Permalink
Switch to Scala 3-based scala-cli-signing
Browse files Browse the repository at this point in the history
  • Loading branch information
alexarchambault committed Nov 16, 2022
1 parent 50c1dcb commit ccf3e98
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 40 deletions.
12 changes: 4 additions & 8 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ trait Options extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests

def ivyDeps = super.ivyDeps() ++ Agg(
Deps.bloopConfig,
Deps.signingCliShared.exclude(("com.github.alexarchambault", "*"))
Deps.signingCliShared
)
def compileIvyDeps = super.compileIvyDeps() ++ Seq(
Deps.jsoniterMacros
Expand Down Expand Up @@ -639,14 +639,12 @@ trait CliOptions extends SbtModule with ScalaCliPublishModule {
super.scalacOptions() ++ extraOptions
}
def ivyDeps = super.ivyDeps() ++ Agg(
Deps.caseApp,
Deps.jsoniterCore213,
Deps.osLib,
Deps.signingCli
.exclude((organization, "config_2.13"))
.exclude(("com.github.alexarchambault", "*"))
Deps.signingCli.exclude((organization, "config_2.13"))
)
def compileIvyDeps = super.compileIvyDeps() ++ Seq(
Deps.caseApp,
Deps.jsoniterMacros
)
def scalaVersion = Scala.defaultInternal
Expand Down Expand Up @@ -762,9 +760,7 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
Deps.metaconfigTypesafe,
Deps.pythonNativeLibs,
Deps.scalaPackager,
Deps.signingCli
.exclude((organization, "config_2.13"))
.exclude(("com.github.alexarchambault", "*")),
Deps.signingCli.exclude((organization, "config_2.13")),
Deps.slf4jNop, // to silence jgit
Deps.sttp
)
Expand Down
4 changes: 2 additions & 2 deletions project/deps.sc
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ object Deps {
def semanticDbScalac = ivy"org.scalameta:::semanticdb-scalac:${Versions.scalaMeta}"
def shapeless = ivy"com.chuusai::shapeless:2.3.9"
def signingCliShared =
ivy"io.github.alexarchambault.scala-cli.signing:shared_2.13:${Versions.signingCli}"
def signingCli = ivy"io.github.alexarchambault.scala-cli.signing:cli_2.13:${Versions.signingCli}"
ivy"io.github.alexarchambault.scala-cli.signing::shared:${Versions.signingCli}"
def signingCli = ivy"io.github.alexarchambault.scala-cli.signing::cli:${Versions.signingCli}"
def slf4jNop = ivy"org.slf4j:slf4j-nop:2.0.3"
// Force using of 2.13 - is there a better way?
def snailgun(force213: Boolean = false) =
Expand Down
34 changes: 17 additions & 17 deletions website/docs/reference/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Add dependencies

### `--repository`

Aliases: `--repo`, `-r`
Aliases: `-r`, `--repo`

Add repositories

Expand Down Expand Up @@ -308,7 +308,7 @@ Custom path to the scalafmt configuration file.

### `--scalafmt-conf-str`

Aliases: `--scalafmt-config-str`, `--scalafmt-conf-snippet`
Aliases: `--scalafmt-conf-snippet`, `--scalafmt-config-str`

Pass configuration as a string.

Expand Down Expand Up @@ -344,7 +344,7 @@ Print help message and exit

### `--help-full`

Aliases: `--full-help`, `-help-full`, `-full-help`
Aliases: `--full-help`, `-full-help`, `-help-full`

Print help message, including hidden options, and exit

Expand All @@ -366,7 +366,7 @@ Show options for ScalaNative

### `--help-scaladoc`

Aliases: `--scaladoc-help`, `--doc-help`, `--help-doc`
Aliases: `--doc-help`, `--help-doc`, `--scaladoc-help`

Show options for Scaladoc

Expand All @@ -378,7 +378,7 @@ Show options for Scala REPL

### `--help-scalafmt`

Aliases: `--scalafmt-help`, `--fmt-help`, `--help-fmt`
Aliases: `--fmt-help`, `--help-fmt`, `--scalafmt-help`

Show options for Scalafmt

Expand Down Expand Up @@ -522,7 +522,7 @@ Specify which main class to run

### `--main-class-ls`

Aliases: `--main-class-list`, `--list-main-class`, `--list-main-classes`
Aliases: `--list-main-class`, `--list-main-classes`, `--main-class-list`

List main classes available in the current context

Expand All @@ -536,7 +536,7 @@ Available in commands:

### `--enable-markdown`

Aliases: `--md`, `--markdown`
Aliases: `--markdown`, `--md`

[experimental] Enable markdown support.

Expand Down Expand Up @@ -570,7 +570,7 @@ Generate a source JAR rather than an executable JAR

### `--doc`

Aliases: `--scaladoc`, `--javadoc`
Aliases: `--javadoc`, `--scaladoc`

Generate a scaladoc JAR rather than an executable JAR

Expand Down Expand Up @@ -804,7 +804,7 @@ Whether to build and publish source JARs

### `--doc`

Aliases: `--scaladoc`, `--javadoc`
Aliases: `--javadoc`, `--scaladoc`

Whether to build and publish doc JARs

Expand Down Expand Up @@ -1225,7 +1225,7 @@ Available in commands:

### `--scalac-option`

Aliases: `--scala-opt`, `-O`, `--scala-option`
Aliases: `-O`, `--scala-opt`, `--scala-option`

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`.

Expand Down Expand Up @@ -1292,20 +1292,20 @@ Available in commands:

### `--scala-version`

Aliases: `--scala`, `-S`
Aliases: `-S`, `--scala`

Set the Scala version (3.2.1 by default)

### `--scala-binary-version`

Aliases: `--scala-binary`, `--scala-bin`, `-B`
Aliases: `-B`, `--scala-bin`, `--scala-binary`

[Internal]
Set the Scala binary version

### `--extra-jars`

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

Add extra JARs and compiled classes to the class path

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

### `--extra-source-jars`

Aliases: `--source-jar`, `--source-jars`, `--extra-source-jar`
Aliases: `--extra-source-jar`, `--source-jar`, `--source-jars`

Add extra source JARs

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

Aliases: `--output-directory`, `-d`, `--destination`, `--compile-output`, `--compile-out`
Aliases: `--compile-out`, `--compile-output`, `-d`, `--destination`, `--output-directory`

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

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

### `--execute-script`

Aliases: `--execute-scala-script`, `--execute-sc`, `-e`
Aliases: `-e`, `--execute-sc`, `--execute-scala-script`

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

### `--working-directory`

Aliases: `--working-dir`, `--dir`
Aliases: `--dir`, `--working-dir`

[Internal]
### Bloop start options
Expand Down
26 changes: 13 additions & 13 deletions website/docs/reference/scala-command/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Add dependencies

### `--repository`

Aliases: `--repo`, `-r`
Aliases: `-r`, `--repo`

Add repositories

Expand Down Expand Up @@ -252,7 +252,7 @@ Custom path to the scalafmt configuration file.

### `--scalafmt-conf-str`

Aliases: `--scalafmt-config-str`, `--scalafmt-conf-snippet`
Aliases: `--scalafmt-conf-snippet`, `--scalafmt-config-str`

Pass configuration as a string.

Expand Down Expand Up @@ -288,7 +288,7 @@ Print help message and exit

### `--help-full`

Aliases: `--full-help`, `-help-full`, `-full-help`
Aliases: `--full-help`, `-full-help`, `-help-full`

Print help message, including hidden options, and exit

Expand All @@ -310,7 +310,7 @@ Show options for ScalaNative

### `--help-scaladoc`

Aliases: `--scaladoc-help`, `--doc-help`, `--help-doc`
Aliases: `--doc-help`, `--help-doc`, `--scaladoc-help`

Show options for Scaladoc

Expand All @@ -322,7 +322,7 @@ Show options for Scala REPL

### `--help-scalafmt`

Aliases: `--scalafmt-help`, `--fmt-help`, `--help-fmt`
Aliases: `--fmt-help`, `--help-fmt`, `--scalafmt-help`

Show options for Scalafmt

Expand Down Expand Up @@ -466,7 +466,7 @@ Specify which main class to run

### `--main-class-ls`

Aliases: `--main-class-list`, `--list-main-class`, `--list-main-classes`
Aliases: `--list-main-class`, `--list-main-classes`, `--main-class-list`

List main classes available in the current context

Expand Down Expand Up @@ -641,7 +641,7 @@ Available in commands:

### `--scalac-option`

Aliases: `--scala-opt`, `-O`, `--scala-option`
Aliases: `-O`, `--scala-opt`, `--scala-option`

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`.

Expand Down Expand Up @@ -675,20 +675,20 @@ Available in commands:

### `--scala-version`

Aliases: `--scala`, `-S`
Aliases: `-S`, `--scala`

Set the Scala version (3.2.1 by default)

### `--scala-binary-version`

Aliases: `--scala-binary`, `--scala-bin`, `-B`
Aliases: `-B`, `--scala-bin`, `--scala-binary`

[Internal]
Set the Scala binary version

### `--extra-jars`

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

Add extra JARs and compiled classes to the class path

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

### `--extra-source-jars`

Aliases: `--source-jar`, `--source-jars`, `--extra-source-jar`
Aliases: `--extra-source-jar`, `--source-jar`, `--source-jars`

Add extra source JARs

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

Aliases: `--output-directory`, `-d`, `--destination`, `--compile-output`, `--compile-out`
Aliases: `--compile-out`, `--compile-output`, `-d`, `--destination`, `--output-directory`

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

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

### `--execute-script`

Aliases: `--execute-scala-script`, `--execute-sc`, `-e`
Aliases: `-e`, `--execute-sc`, `--execute-scala-script`

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

0 comments on commit ccf3e98

Please sign in to comment.