Skip to content

Commit 9ee7c1e

Browse files
committed
Remove no-longer-needed JDK 21 workaround
We'd added this to work around scala/bug#12783 , but sbt has taken the 2.12.18 upgrade now
1 parent 6c5f388 commit 9ee7c1e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
name: "JDK 8 pr validation"
4545
if: type = pull_request
4646
script:
47-
- sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18 -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
47+
- sbt -Dsbt.io.jdktimestamps=true -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
4848
- STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
49-
- sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18 -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll
49+
- sbt -Dsbt.io.jdktimestamps=true -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll
5050

5151
# build the spec using jekyll
5252
- stage: build

scripts/common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SBT_VERSION=`grep sbt.version $WORKSPACE/project/build.properties | sed -n 's/sb
1919
SBT_CMD=${SBT_CMD-sbt}
2020
# the jdktimestamps thing is to work around https://github.com/sbt/sbt/issues/7463 --
2121
# it can be removed again once we're on an sbt version with a fix
22-
SBT_CMD="$SBT_CMD -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18 -sbt-version $SBT_VERSION"
22+
SBT_CMD="$SBT_CMD -Dsbt.io.jdktimestamps=true -sbt-version $SBT_VERSION"
2323

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

0 commit comments

Comments
 (0)