From 0f46c34da0e813ee9a74df16b35fb0b7b1b1d0eb Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Sun, 1 Aug 2021 23:00:15 -0700 Subject: [PATCH] provide official sbt launch script as default (#43) also continue providing sbt-extras, but as `sbtx` --- README.md | 10 ++++------ src/install.ts | 6 +++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index aea35630..6a4e71a3 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,11 @@ sbt. - Configurable Java version: supports OpenJDK, GraalVM, Zulu and any other Java version that's installable via Jabba. -- The `sbt` command is installed using the - [paulp/sbt-extras](https://github.com/paulp/sbt-extras/) launcher. -- For faster startup, the `csbt` command is installed using the Coursier-based - [coursier/sbt-extras](https://github.com/coursier/sbt-extras/) launcher. This - launcher does not work with all builds, only use `csbt` if you know what you - are doing. - Cross-platform: works on Linux, macOS, Windows. +- The `sbt` command is provided, with the official sbt launch script. +- The following alternate sbt launch scripts are also provided: + - `sbtx` runs the [sbt-extras](https://github.com/dwijnand/sbt-extras/) launcher. + - `csbt` runs the [Coursier-based sbt-extras](https://github.com/coursier/sbt-extras/) launcher. ## Usage: diff --git a/src/install.ts b/src/install.ts index 4ec74b8e..38fec284 100644 --- a/src/install.ts +++ b/src/install.ts @@ -114,9 +114,13 @@ function installSbt() { core.startGroup("Install sbt"); core.addPath(bin); curl( - "https://raw.githubusercontent.com/paulp/sbt-extras/master/sbt", + "https://raw.githubusercontent.com/sbt/sbt/develop/sbt", path.join(bin, "sbt") ); + curl( + "https://raw.githubusercontent.com/dwijnand/sbt-extras/master/sbt", + path.join(bin, "sbtx") + ); curl( "https://raw.githubusercontent.com/coursier/sbt-extras/master/sbt", path.join(bin, "csbt")