Merge pull request #7122 from eed3si9n/wip/sbtn

Fixes Debian 11 compat
This commit is contained in:
eugene yokota 2023-01-04 22:38:10 -05:00 committed by GitHub
commit a7f6717c6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View File

@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
- os: ubuntu-20.04
java: 17
distribution: temurin
jobtype: 1

View File

@ -121,7 +121,7 @@ val root = (project in file(".")).
file
},
// update sbt.sh at root
sbtnVersion := "1.8.1",
sbtnVersion := "1.8.2",
sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download",
sbtnJarsMappings := {
val baseUrl = sbtnJarsBaseUrl.value

View File

@ -37,7 +37,7 @@ class InstallSbtnSpec extends AnyFlatSpec {
"InstallSbtn" should "extract native sbtn" ignore
withTemp(".zip") { tmp =>
withTemp(".exe") { sbtn =>
InstallSbtn.extractSbtn(term, "1.8.1", tmp, sbtn)
InstallSbtn.extractSbtn(term, "1.8.2", tmp, sbtn)
val tmpDir = Files.createTempDirectory("sbtn-test").toRealPath()
Files.createDirectories(tmpDir.resolve("project"))
val foo = tmpDir.resolve("foo")

2
sbt
View File

@ -24,7 +24,7 @@ declare build_props_sbt_version=
declare use_sbtn=
declare no_server=
declare sbtn_command="$SBTN_CMD"
declare sbtn_version="1.8.1"
declare sbtn_version="1.8.2"
### ------------------------------- ###
### Helper methods for BASH scripts ###