hanyi8000
/
Scala
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10667 from SethTisue/merge-2.12-to-2.13-20240118 

Merge 2.12 to 2.13 20240118 [ci: last-only]
This commit is contained in:
Lukas Rytz 2024-01-19 08:55:55 +01:00 committed by GitHub
parent 951cc9b1cc 1bff17bb20
commit 1d090d8550
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -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 version: ~> 1.0 # needed for imports
import: scala/scala-dev:travis/default.yml 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 name: build, publishLocal, build again
script: script:
- set -e - 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 - 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: workspaces:
create: create:
name: bootstrapped name: bootstrapped
@ -53,7 +57,7 @@ templates: # this has no effect on travis, it's just a place to put our template
script: script:
- set -e - set -e
- STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR - 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 test2: &test2
stage: test stage: test
@ -63,7 +67,7 @@ templates: # this has no effect on travis, it's just a place to put our template
script: script:
- set -e - set -e
- STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR - 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: jobs:
include: include:
@ -113,7 +117,7 @@ jobs:
script: script:
- set -e - set -e
- STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR - 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 - name: build benchmarks
if: type = pull_request OR repo != scala/scala if: type = pull_request OR repo != scala/scala
@ -122,7 +126,7 @@ jobs:
script: script:
- set -e - set -e
- STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR - 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 - stage: build
if: type = pull_request OR type = push if: type = pull_request OR type = push

4
NOTICE
View File

@ -1,6 +1,6 @@
Scala Scala
Copyright (c) 2002-2023 EPFL Copyright (c) 2002-2024 EPFL
Copyright (c) 2011-2023 Lightbend, Inc. Copyright (c) 2011-2024 Lightbend, Inc.
Scala includes software developed at Scala includes software developed at
LAMP/EPFL (https://lamp.epfl.ch/) and LAMP/EPFL (https://lamp.epfl.ch/) and

3
build.sbt
View File

@ -969,6 +969,9 @@ lazy val sbtTest = project.in(file("test") / "sbt-test")
scriptedBufferLog := true, scriptedBufferLog := true,
scriptedLaunchOpts ++= Seq( 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, "-Dplugin.scalaVersion=" + version.value,
"-Dsbt.boot.directory=" + (target.value / ".sbt-scripted").getAbsolutePath, // Workaround sbt/sbt#3469 "-Dsbt.boot.directory=" + (target.value / ".sbt-scripted").getAbsolutePath, // Workaround sbt/sbt#3469
"-Dscripted.common=" + (baseDirectory.value / "common.sbt.template").getAbsolutePath, "-Dscripted.common=" + (baseDirectory.value / "common.sbt.template").getAbsolutePath,

4
doc/LICENSE.md
View File

@ -2,9 +2,9 @@ Scala is licensed under the [Apache License Version 2.0](https://www.apache.org/
## Scala License ## 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. All rights reserved.

4
doc/License.rtf
View File

@ -23,8 +23,8 @@ Scala is licensed under the\'a0{\field{\*\fldinst{HYPERLINK "https://www.apache.
\fs48 \cf2 Scala License\ \fs48 \cf2 Scala License\
\pard\pardeftab720\sl360\sa320\partightenfactor0 \pard\pardeftab720\sl360\sa320\partightenfactor0
\f0\b0\fs28 \cf2 Copyright (c) 2002-2023 EPFL\ \f0\b0\fs28 \cf2 Copyright (c) 2002-2024 EPFL\
Copyright (c) 2011-2023 Lightbend, Inc.\ Copyright (c) 2011-2024 Lightbend, Inc.\
All rights reserved.\ All rights reserved.\
\pard\pardeftab720\sl360\sa320\partightenfactor0 \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}}.\ \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}}.\

2
project/VersionUtil.scala
View File

@ -29,7 +29,7 @@ object VersionUtil {
) )
lazy val generatePropertiesFileSettings = Seq[Setting[_]]( lazy val generatePropertiesFileSettings = Seq[Setting[_]](
copyrightString := "Copyright 2002-2023, LAMP/EPFL and Lightbend, Inc.", copyrightString := "Copyright 2002-2024, LAMP/EPFL and Lightbend, Inc.",
shellBannerString := """ shellBannerString := """
| ________ ___ / / ___ | ________ ___ / / ___
| / __/ __// _ | / / / _ | | / __/ __// _ | / / / _ |

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.9.7 sbt.version=1.9.8

2
project/plugins.sbt
View File

@ -36,4 +36,4 @@ Global / concurrentRestrictions := Seq(
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") 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")

4
scripts/common
View File

@ -13,7 +13,9 @@ fi
SBT_VERSION=`grep sbt.version $WORKSPACE/project/build.properties | sed -n 's/sbt.version=\(.*\)/\1/p'` 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-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 # repo to publish builds
integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"} integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}

2
src/library/scala/util/Properties.scala
View File

@ -92,7 +92,7 @@ private[scala] trait PropertiesTrait {
/** A verbose alternative to [[versionNumberString]]. /** A verbose alternative to [[versionNumberString]].
*/ */
val versionString = s"version ${scalaPropOrElse("version.number", "(unknown)")}" 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. /** 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. * Note that it uses "prop" i.e. looks in the scala jar, not the system properties.

2
src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
View File

@ -341,7 +341,7 @@ trait EntityPage extends HtmlPage {
val postamble = val postamble =
List(Div(id = "tooltip"), List(Div(id = "tooltip"),
if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value)) 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 else
Div(id = "footer", elems = Txt(tpl.universe.settings.docfooter.value))) Div(id = "footer", elems = Txt(tpl.universe.settings.docfooter.value)))

2
src/scalap/decoder.properties
View File

@ -1,2 +1,2 @@
version.number=2.0.1 version.number=2.0.1
copyright.string=(c) 2002-2023 LAMP/EPFL copyright.string=(c) 2002-2024 LAMP/EPFL