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 5ee2508

Browse files
Merge branch 'main' into simplify-actions
2 parents dafa2df + b623461 commit 5ee2508

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
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
@@ -110,7 +110,7 @@ workflows:
110110
- scala_job:
111111
name: jdk11_2.12
112112
java_version: jdk11
113-
scala_version: 2.12.15
113+
scala_version: 2.12.16
114114
- scala_job:
115115
name: jdk11_2.13
116116
java_version: jdk11
@@ -126,7 +126,7 @@ workflows:
126126
- scala_job:
127127
name: jdk17_2.12
128128
java_version: jdk17
129-
scala_version: 2.12.15
129+
scala_version: 2.12.16
130130
- scala_job:
131131
name: jdk17_2.13
132132
java_version: jdk17
@@ -141,7 +141,7 @@ workflows:
141141
scala_version: 3.1.3
142142
- scalajs_job:
143143
name: sjs1.0_2.12
144-
scala_version: 2.12.15
144+
scala_version: 2.12.16
145145
- scalajs_job:
146146
name: sjs1.0_2.13
147147
scala_version: 2.13.8
@@ -153,7 +153,7 @@ workflows:
153153
scala_version: 3.1.3
154154
- scalanative_job:
155155
name: native0.4_2.12
156-
scala_version: 2.12.15
156+
scala_version: 2.12.16
157157
- scalanative_job:
158158
name: native0.4_2.13
159159
scala_version: 2.13.8

‎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.0.2", "3.1.3"),
39-
scalaVersion := "2.12.15",
38+
crossScalaVersions := Seq("2.13.8", "2.12.16", "3.0.2", "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 によって変換されたページ (->オリジナル) /