Skip to content

Commit

Permalink
Merge pull request #10665 from scala-steward/update/2.12.x/sbt-1.9.8
Browse files Browse the repository at this point in the history
Update sbt to 1.9.8 in 2.12.x
  • Loading branch information
SethTisue committed Jan 18, 2024
2 parents e8ace4b + 2486172 commit 6c5f388
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
@@ -1,3 +1,7 @@
# `-Dsbt.io.jdktimestamps=true` is used to work around
# this bug in sbt 1.9.8: https://github.com/sbt/sbt/issues/7463
# we can remove it once we're on an sbt version with a fix.

version: ~> 1.0 # needed for imports

import: scala/scala-dev:travis/default.yml
Expand Down Expand Up @@ -40,9 +44,9 @@ jobs:
name: "JDK 8 pr validation"
if: type = pull_request
script:
- sbt -Dsbt.scala.version=2.12.18 -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
- sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18 -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
- STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
- sbt -Dsbt.scala.version=2.12.18 -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll
- sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18 -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll

# build the spec using jekyll
- stage: build
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=1.9.7
sbt.version=1.9.8
4 changes: 3 additions & 1 deletion scripts/common
Expand Up @@ -17,7 +17,9 @@ mkdir -p "$WORKSPACE/resolutionScratch_"
SBT_VERSION=`grep sbt.version $WORKSPACE/project/build.properties | sed -n 's/sbt.version=\(.*\)/\1/p'`

SBT_CMD=${SBT_CMD-sbt}
SBT_CMD="$SBT_CMD -Dsbt.scala.version=2.12.18 -sbt-version $SBT_VERSION"
# the jdktimestamps thing is to work around https://github.com/sbt/sbt/issues/7463 --
# it can be removed again once we're on an sbt version with a fix
SBT_CMD="$SBT_CMD -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18 -sbt-version $SBT_VERSION"

# repo to publish builds
integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}
Expand Down

0 comments on commit 6c5f388

Please sign in to comment.