diff --git a/.travis.yml b/.travis.yml index 112c74103d..21545fd702 100644 --- a/.travis.yml +++ b/.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 @@ -27,9 +31,9 @@ templates: # this has no effect on travis, it's just a place to put our template name: build, publishLocal, build again script: - set -e - - sbt -Dsbt.scala.version=2.12.18-M2 setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal + - sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18-M2 setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR - - sbt -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest compile + - sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest compile workspaces: create: name: bootstrapped @@ -53,7 +57,7 @@ templates: # this has no effect on travis, it's just a place to put our template script: - set -e - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR - - sbt -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest Test/compile testAll1 + - sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest Test/compile testAll1 test2: &test2 stage: test @@ -63,7 +67,7 @@ templates: # this has no effect on travis, it's just a place to put our template script: - set -e - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR - - sbt -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest testAll2 + - sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest testAll2 jobs: include: @@ -113,7 +117,7 @@ jobs: script: - set -e - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR - - sbt -Dsbt.scala.version=2.12.18-M2 -Dscala.build.compileWithDotty=true library/compile + - sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18-M2 -Dscala.build.compileWithDotty=true library/compile - name: build benchmarks if: type = pull_request OR repo != scala/scala @@ -122,7 +126,7 @@ jobs: script: - set -e - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR - - sbt -Dsbt.scala.version=2.12.18-M2 bench/Jmh/compile + - sbt -Dsbt.io.jdktimestamps=true -Dsbt.scala.version=2.12.18-M2 bench/Jmh/compile - stage: build if: type = pull_request OR type = push diff --git a/NOTICE b/NOTICE index 5bceee7b36..22457ecf1a 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ Scala -Copyright (c) 2002-2023 EPFL -Copyright (c) 2011-2023 Lightbend, Inc. +Copyright (c) 2002-2024 EPFL +Copyright (c) 2011-2024 Lightbend, Inc. Scala includes software developed at LAMP/EPFL (https://lamp.epfl.ch/) and diff --git a/build.sbt b/build.sbt index da6ecfd804..039155cff4 100644 --- a/build.sbt +++ b/build.sbt @@ -969,6 +969,9 @@ lazy val sbtTest = project.in(file("test") / "sbt-test") scriptedBufferLog := true, scriptedLaunchOpts ++= Seq( + // work around https://github.com/sbt/sbt/issues/7463 + // we can remove it once we're on an sbt version with a fix. + "-Dsbt.io.jdktimestamps=true", "-Dplugin.scalaVersion=" + version.value, "-Dsbt.boot.directory=" + (target.value / ".sbt-scripted").getAbsolutePath, // Workaround sbt/sbt#3469 "-Dscripted.common=" + (baseDirectory.value / "common.sbt.template").getAbsolutePath, diff --git a/doc/LICENSE.md b/doc/LICENSE.md index 0e13c11269..78d04c6f44 100644 --- a/doc/LICENSE.md +++ b/doc/LICENSE.md @@ -2,9 +2,9 @@ Scala is licensed under the [Apache License Version 2.0](https://www.apache.org/ ## Scala License -Copyright (c) 2002-2023 EPFL +Copyright (c) 2002-2024 EPFL -Copyright (c) 2011-2023 Lightbend, Inc. +Copyright (c) 2011-2024 Lightbend, Inc. All rights reserved. diff --git a/doc/License.rtf b/doc/License.rtf index 57ed3c3e42..eb2f0de43c 100644 --- a/doc/License.rtf +++ b/doc/License.rtf @@ -23,8 +23,8 @@ Scala is licensed under the\'a0{\field{\*\fldinst{HYPERLINK "https://www.apache. \fs48 \cf2 Scala License\ \pard\pardeftab720\sl360\sa320\partightenfactor0 -\f0\b0\fs28 \cf2 Copyright (c) 2002-2023 EPFL\ -Copyright (c) 2011-2023 Lightbend, Inc.\ +\f0\b0\fs28 \cf2 Copyright (c) 2002-2024 EPFL\ +Copyright (c) 2011-2024 Lightbend, Inc.\ All rights reserved.\ \pard\pardeftab720\sl360\sa320\partightenfactor0 \cf2 \cb4 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at {\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/LICENSE-2.0"}}{\fldrslt http://www.apache.org/licenses/LICENSE-2.0}}.\ diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala index f177278ee5..49afb6b0a3 100644 --- a/project/VersionUtil.scala +++ b/project/VersionUtil.scala @@ -29,7 +29,7 @@ object VersionUtil { ) lazy val generatePropertiesFileSettings = Seq[Setting[_]]( - copyrightString := "Copyright 2002-2023, LAMP/EPFL and Lightbend, Inc.", + copyrightString := "Copyright 2002-2024, LAMP/EPFL and Lightbend, Inc.", shellBannerString := """ | ________ ___ / / ___ | / __/ __// _ | / / / _ | diff --git a/project/build.properties b/project/build.properties index e8a1e246e8..abbbce5da4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index e5e8b055a8..731e0d50be 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -36,4 +36,4 @@ Global / concurrentRestrictions := Seq( addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6") +addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") diff --git a/scripts/common b/scripts/common index 2dd91be08b..e3d49f3c11 100644 --- a/scripts/common +++ b/scripts/common @@ -13,7 +13,9 @@ fi 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-M2 -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-M2 -sbt-version $SBT_VERSION" # repo to publish builds integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"} diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index c904a86724..4fea468ee1 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -92,7 +92,7 @@ private[scala] trait PropertiesTrait { /** A verbose alternative to [[versionNumberString]]. */ val versionString = s"version ${scalaPropOrElse("version.number", "(unknown)")}" - val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2023, LAMP/EPFL and Lightbend, Inc.") + val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2024, LAMP/EPFL and Lightbend, Inc.") /** This is the encoding to use reading in source files, overridden with -encoding. * Note that it uses "prop" i.e. looks in the scala jar, not the system properties. diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala index 380e91b61f..aac43180d0 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala @@ -341,7 +341,7 @@ trait EntityPage extends HtmlPage { val postamble = List(Div(id = "tooltip"), if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value)) - Div(id = "footer", elems = Txt("Scala programming documentation. Copyright (c) 2002-2023 ") :: A(href = "https://www.epfl.ch", target = "_top", elems = Txt("EPFL")) :: Txt(" and ") :: A(href = "https://www.lightbend.com", target = "_top", elems = Txt("Lightbend")) :: Txt(".")) + Div(id = "footer", elems = Txt("Scala programming documentation. Copyright (c) 2002-2024 ") :: A(href = "https://www.epfl.ch", target = "_top", elems = Txt("EPFL")) :: Txt(" and ") :: A(href = "https://www.lightbend.com", target = "_top", elems = Txt("Lightbend")) :: Txt(".")) else Div(id = "footer", elems = Txt(tpl.universe.settings.docfooter.value))) diff --git a/src/scalap/decoder.properties b/src/scalap/decoder.properties index b5e00dc083..e27b29c0e1 100644 --- a/src/scalap/decoder.properties +++ b/src/scalap/decoder.properties @@ -1,2 +1,2 @@ version.number=2.0.1 -copyright.string=(c) 2002-2023 LAMP/EPFL +copyright.string=(c) 2002-2024 LAMP/EPFL