Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b5f231f

Browse files
Merge branch 'main' into drop-scala-3.0
2 parents 84da01b + b623461 commit b5f231f

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

‎.circleci/config.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ commands:
2020
parameters:
2121
scala_version:
2222
type: string
23-
default: 2.12.15
23+
default: 2.12.16
2424
sbt_tasks:
2525
type: string
2626
default: update compile test:compile test doc package osgiBundle
@@ -44,7 +44,7 @@ jobs:
4444
parameters:
4545
scala_version:
4646
description: "Scala version"
47-
default: 2.12.15
47+
default: 2.12.16
4848
type: string
4949
java_version:
5050
description: "Java version"
@@ -61,7 +61,7 @@ jobs:
6161
parameters:
6262
scala_version:
6363
description: "Scala version"
64-
default: 2.12.15
64+
default: 2.12.16
6565
type: string
6666
steps:
6767
- checkout
@@ -75,7 +75,7 @@ jobs:
7575
parameters:
7676
scala_version:
7777
description: "Scala version"
78-
default: 2.12.15
78+
default: 2.12.16
7979
type: string
8080
steps:
8181
- checkout
@@ -92,9 +92,9 @@ workflows:
9292
build:
9393
jobs:
9494
- scala_job:
95-
name: 2.12.15
95+
name: 2.12.16
9696
java_version: jdk8
97-
scala_version: 2.12.15
97+
scala_version: 2.12.16
9898
- scala_job:
9999
name: 2.13.8
100100
java_version: jdk8
@@ -106,7 +106,7 @@ workflows:
106106
- scala_job:
107107
name: jdk11_2.12
108108
java_version: jdk11
109-
scala_version: 2.12.15
109+
scala_version: 2.12.16
110110
- scala_job:
111111
name: jdk11_2.13
112112
java_version: jdk11
@@ -118,7 +118,7 @@ workflows:
118118
- scala_job:
119119
name: jdk17_2.12
120120
java_version: jdk17
121-
scala_version: 2.12.15
121+
scala_version: 2.12.16
122122
- scala_job:
123123
name: jdk17_2.13
124124
java_version: jdk17
@@ -129,7 +129,7 @@ workflows:
129129
scala_version: 3.1.3
130130
- scalajs_job:
131131
name: sjs1.0_2.12
132-
scala_version: 2.12.15
132+
scala_version: 2.12.16
133133
- scalajs_job:
134134
name: sjs1.0_2.13
135135
scala_version: 2.13.8
@@ -138,7 +138,7 @@ workflows:
138138
scala_version: 3.1.3
139139
- scalanative_job:
140140
name: native0.4_2.12
141-
scala_version: 2.12.15
141+
scala_version: 2.12.16
142142
- scalanative_job:
143143
name: native0.4_2.13
144144
scala_version: 2.13.8

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
java: [8, 11, 17]
13-
scala: [2.12.15, 2.13.8, 3.1.3]
13+
scala: [2.12.16, 2.13.8, 3.1.3]
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2

‎build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
3535
.settings(
3636
name := "scala-xml",
3737
scalaModuleAutomaticModuleName := Some("scala.xml"),
38-
crossScalaVersions := Seq("2.13.8", "2.12.15", "3.1.3"),
39-
scalaVersion := "2.12.15",
38+
crossScalaVersions := Seq("2.13.8", "2.12.16", "3.1.3"),
39+
scalaVersion := "2.12.16",
4040

4141
// Don't publish for Scala 3.1 or later, only from 3.0
4242
publish / skip := (CrossVersion.partialVersion(scalaVersion.value) match {

‎project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.0.1")
22
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
33
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
5-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4")
5+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5")
66
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /