From 2ae86f377d689780ca767664423545c4a7912b82 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 21 Feb 2024 19:04:24 -0800 Subject: [PATCH 1/2] re-STARR onto 2.12.19 --- build.sbt | 2 +- project/MimaFilters.scala | 2 +- versions.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index b70db5b00fcb..846bba64c1d7 100644 --- a/build.sbt +++ b/build.sbt @@ -95,7 +95,7 @@ lazy val publishSettings : Seq[Setting[_]] = Seq( // should not be set directly. It is the same as the Maven version and derived automatically from `baseVersion` and // `baseVersionSuffix`. globalVersionSettings -(Global / baseVersion) := "2.12.19" +(Global / baseVersion) := "2.12.20" (Global / baseVersionSuffix) := "SNAPSHOT" (ThisBuild / organization) := "org.scala-lang" (ThisBuild / homepage) := Some(url("https://www.scala-lang.org")) diff --git a/project/MimaFilters.scala b/project/MimaFilters.scala index 34b83de04abe..aa2192492cb3 100644 --- a/project/MimaFilters.scala +++ b/project/MimaFilters.scala @@ -13,7 +13,7 @@ object MimaFilters extends AutoPlugin { import autoImport._ override val globalSettings = Seq( - mimaReferenceVersion := Some("2.12.18"), + mimaReferenceVersion := Some("2.12.19"), ) val mimaFilters: Seq[ProblemFilter] = Seq[ProblemFilter]( diff --git a/versions.properties b/versions.properties index 165105056e2f..11885d22402f 100644 --- a/versions.properties +++ b/versions.properties @@ -1,5 +1,5 @@ # Scala version used for bootstrapping (see README.md) -starr.version=2.12.18 +starr.version=2.12.19 # The scala.binary.version determines how modules are resolved. It is set as follows: # - After 2.x.0 is released, the binary version is 2.x From 4e99fa5f10c05a60834cd1fa3a8296acfe0c1d64 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 23 Feb 2024 07:57:13 -0800 Subject: [PATCH 2/2] sbt 1.9.9 (was .8) and remove now-unnecessary workaround from build --- .travis.yml | 8 ++------ project/build.properties | 2 +- scripts/common | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 127a85cb4384..e2b5a65756e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,3 @@ -# `-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 @@ -44,9 +40,9 @@ jobs: name: "JDK 8 pr validation" if: type = pull_request script: - - sbt -Dsbt.io.jdktimestamps=true -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal + - sbt -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal - STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR - - sbt -Dsbt.io.jdktimestamps=true -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll + - sbt -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll # build the spec using jekyll - stage: build diff --git a/project/build.properties b/project/build.properties index abbbce5da4a8..04267b14af69 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/scripts/common b/scripts/common index e5dbbd8fa993..425fe9fcd575 100644 --- a/scripts/common +++ b/scripts/common @@ -17,9 +17,7 @@ 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} -# 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 -sbt-version $SBT_VERSION" +SBT_CMD="$SBT_CMD -sbt-version $SBT_VERSION" # repo to publish builds integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}