Skip to content

merge 1.x onto master #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 38 commits into from
Sep 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
59ff6c0
Use 2.13.0-RC2 release candidate
ashawley May 16, 2019
23b23dd
support Scala 2.13.0-RC3 (drop RC2)
SethTisue May 29, 2019
0c53c45
restore MiMa exemption temporarily
SethTisue May 29, 2019
a784ceb
Merge pull request #315 from SethTisue/rc3
SethTisue May 29, 2019
fb772d5
upgrade 1.x branch to sbt 0.13.18
SethTisue May 30, 2019
04d4b06
Merge pull request #317 from SethTisue/sbt-0.13.18
SethTisue May 30, 2019
4abaf7c
Use Scala 2.13.0
ashawley Jun 7, 2019
0359b53
Merge pull request #320 from ashawley/1.x-2.13.0
ashawley Jun 7, 2019
9c0b747
Use openjdk8 in Travis
ashawley Jun 18, 2019
58f7f6f
Revert openjdk8 since it's not available on Ubuntu 12 precise
ashawley Jun 18, 2019
fed1d50
Fix link to latest release for scala 2.13
Philippus Jun 24, 2019
273bd64
Deprecate scala.xml.persistent
ashawley Jun 25, 2019
2bc3bbc
Merge pull request #330 from ashawley/deprecate-persistent
ashawley Aug 1, 2019
f4f32b4
Use openjdk8 on Travis for 1.x
ashawley Jan 21, 2020
02daeb8
Merge pull request #393 from ashawley/openjdk8-travis
ashawley Jan 21, 2020
b345ad1
Deprecate various classes
ashawley Jan 21, 2020
0723a87
Add empty Circle config
ashawley Jan 21, 2020
961182a
Merge pull request #394 from ashawley/deprecate-etc
ashawley Jan 21, 2020
a410659
Merge pull request #395 from ashawley/empty-circle
ashawley Jan 21, 2020
bcb83f3
Fix 2.13 collections methods for NodeSeq
ashawley Jan 22, 2020
e723935
Add test of issue 392
ashawley Jan 22, 2020
df7d18e
Add further tests of NodeSeq
ashawley Jan 31, 2020
306fe58
Merge pull request #396 from ashawley/issue-392
ashawley Jan 31, 2020
a311d74
Various updates for 1.3.0
ashawley Feb 6, 2020
003f60c
Merge pull request #411 from ashawley/1.3-update
ashawley Feb 6, 2020
5966334
backport new publishing scripts based on sbt-ci-release
lrytz Feb 24, 2020
172ce22
Merge pull request #418 from lrytz/publish-backport
lrytz Feb 27, 2020
c60de43
Update to Scala.js 1.0.1
ashawley Mar 16, 2020
6205001
Merge commit 'a784ceb8836eaa8460482c943ff228b086466469' into merge-1.…
SethTisue Sep 15, 2020
e2a3c3c
Merge commit '273bd64ce39cd7425d789019653625b45d30f7e8' into merge-1.…
SethTisue Sep 15, 2020
43d3ebf
Merge commit '003f60cd776975c05a58628297714364314f01df' into merge-1.…
SethTisue Sep 15, 2020
57353cd
bump Scala, sbt, Scala.js versions
SethTisue Sep 15, 2020
a2d6d9a
Merge pull request #447 from SethTisue/version-bumps-1.x
SethTisue Sep 15, 2020
a63681b
Merge commit '172ce22ca19a21cd3e4e9e7b5fad2f8b14819cf4' into merge-1.…
SethTisue Sep 15, 2020
a1fb5d6
Merge remote-tracking branch 'origin/1.x' into merge-1.x-to-master-20…
SethTisue Sep 15, 2020
89fed18
Merge remote-tracking branch 'origin/master' into merge-1.x-to-master…
SethTisue Sep 15, 2020
7f35af5
fix bad merge
SethTisue Sep 15, 2020
d2e5e84
fix up version numbers in CircleCI config
SethTisue Sep 15, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ commands:
parameters:
scala_version:
type: string
default: 2.12.10
default: 2.12.12
sbt_tasks:
type: string
default: update compile test:compile test doc package
Expand All @@ -44,7 +44,7 @@ jobs:
parameters:
scala_version:
description: "Scala version"
default: 2.12.10
default: 2.12.12
type: string
java_version:
description: "Java version"
Expand All @@ -61,7 +61,7 @@ jobs:
parameters:
scala_version:
description: "Scala version"
default: 2.12.10
default: 2.12.12
type: string
scalajs_version:
description: "ScalaJS version"
Expand All @@ -81,58 +81,58 @@ workflows:
build:
jobs:
- scala_job:
name: 2.12.10
name: 2.12.12
java_version: jdk8
scala_version: 2.12.10
scala_version: 2.12.12
- scala_job:
name: 2.13.1
name: 2.13.3
java_version: jdk8
scala_version: 2.13.1
scala_version: 2.13.3
- scala_job:
name: dotty-0.27.0-RC1
java_version: jdk8
scala_version: 0.27.0-RC1
- scala_job:
name: jdk11_2.12
java_version: jdk11
scala_version: 2.12.10
scala_version: 2.12.12
- scala_job:
name: jdk11_2.13
java_version: jdk11
scala_version: 2.13.1
scala_version: 2.13.3
- scala_job:
name: jdk11_dotty
java_version: jdk11
scala_version: 0.27.0-RC1
- scala_job:
name: jdk13_2.12
java_version: jdk13
scala_version: 2.12.10
scala_version: 2.12.12
- scala_job:
name: jdk13_2.13
java_version: jdk13
scala_version: 2.13.1
scala_version: 2.13.3
- scala_job:
name: jdk13_dotty
java_version: jdk13
scala_version: 0.27.0-RC1
- scala_job:
name: jdk14_2.12
java_version: jdk14
scala_version: 2.12.10
scala_version: 2.12.12
- scala_job:
name: jdk14_2.13
java_version: jdk14
scala_version: 2.13.1
scala_version: 2.13.3
- scala_job:
name: jdk14_dotty
java_version: jdk14
scala_version: 0.27.0-RC1
- scalajs_job:
name: sjs1.0_2.12
scala_version: 2.12.10
scala_version: 2.12.12
scalajs_version: 1.2.0
- scalajs_job:
name: sjs1.0_2.13
scala_version: 2.13.1
scala_version: 2.13.3
scalajs_version: 1.2.0
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ language: scala

scala:
- 0.27.0-RC1
- 2.12.10
- 2.13.1
- 2.12.12
- 2.13.3

env:
- SCALAJS_VERSION= ADOPTOPENJDK=8
Expand Down
4 changes: 1 addition & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ lazy val configSettings: Seq[Setting[_]] = Seq(
}
)


lazy val xml = crossProject(JSPlatform, JVMPlatform)
.withoutSuffixFor(JVMPlatform)
.crossType(CrossType.Full)
Expand All @@ -28,7 +27,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
.jvmSettings(ScalaModulePlugin.scalaModuleOsgiSettings)
.settings(
name := "scala-xml",

scalacOptions ++= {
val opts =
if (isDotty.value)
Expand All @@ -44,7 +42,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)

scalaModuleMimaPreviousVersion := {
if (isDotty.value) None // No such release yet
// else if (System.getenv("SCALAJS_VERSION") == "1.0.0") None
// else if (System.getenv("SCALAJS_VERSION") == "1.0.1") None
else Some("1.3.0")
},
mimaBinaryIssueFilters ++= {
Expand Down
28 changes: 9 additions & 19 deletions jvm/src/test/scala-2.x/scala/xml/CompilerErrors.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,15 @@ import org.junit.Test
class CompilerErrors extends CompilerTesting {
@Test
def t7185() = {
// Error message 2.13.1 and earlier:
// expectXmlError("""|overloaded method value apply with alternatives:
// | (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
// | (i: Int)scala.xml.Node
// | cannot be applied to ()""".stripMargin,
// """|object Test {
// | <e></e>()
// |}""")

// Error message changed in Scala 2.13.2
// https://github.com/scala/scala/pull/8592
expectXmlError("overloaded method", // " apply "
"""|object Test {
| <e></e>()
|}""")
expectXmlError("""|with alternatives:
| (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
| (i: Int)scala.xml.Node
| cannot be applied to ()""".stripMargin,
// the error message here differs a bit by Scala version
import util.Properties.versionNumberString
val thing =
if (versionNumberString.startsWith("2.11") || versionNumberString.startsWith("2.12")) "method value"
else "method"
expectXmlError(s"""|overloaded $thing apply with alternatives:
| (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
| (i: Int)scala.xml.Node
| cannot be applied to ()""".stripMargin,
"""|object Test {
| <e></e>()
|}""")
Expand Down