Commit f579a33

committed

Merge branch 'main' into update/scala-compiler-2.13.10

2 parents 2946831 + 897d829 commit f579a33Copy full SHA for f579a33

File tree

4 files changed

+14

-14

lines changed

.circleci
- config.yml
build.sbt
project
- build.properties
- plugins.sbt

4 files changed

+14

-14

lines changed

`‎.circleci/config.yml‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ commands:`
`20`	`20`	`parameters:`
`21`	`21`	`scala_version:`
`22`	`22`	`type: string`
`23`		`- default: 2.12.16`
	`23`	`+ default: 2.12.17`
`24`	`24`	`sbt_tasks:`
`25`	`25`	`type: string`
`26`	`26`	`default: update compile test:compile test doc package osgiBundle`
`@@ -44,7 +44,7 @@ jobs:`
`44`	`44`	`parameters:`
`45`	`45`	`scala_version:`
`46`	`46`	`description: "Scala version"`
`47`		`- default: 2.12.16`
	`47`	`+ default: 2.12.17`
`48`	`48`	`type: string`
`49`	`49`	`java_version:`
`50`	`50`	`description: "Java version"`
`@@ -61,7 +61,7 @@ jobs:`
`61`	`61`	`parameters:`
`62`	`62`	`scala_version:`
`63`	`63`	`description: "Scala version"`
`64`		`- default: 2.12.16`
	`64`	`+ default: 2.12.17`
`65`	`65`	`type: string`
`66`	`66`	`steps:`
`67`	`67`	`- checkout`
`@@ -75,7 +75,7 @@ jobs:`
`75`	`75`	`parameters:`
`76`	`76`	`scala_version:`
`77`	`77`	`description: "Scala version"`
`78`		`- default: 2.12.16`
	`78`	`+ default: 2.12.17`
`79`	`79`	`type: string`
`80`	`80`	`steps:`
`81`	`81`	`- checkout`
`@@ -92,9 +92,9 @@ workflows:`
`92`	`92`	`build:`
`93`	`93`	`jobs:`
`94`	`94`	`- scala_job:`
`95`		`- name: 2.12.16`
	`95`	`+ name: 2.12.17`
`96`	`96`	`java_version: jdk8`
`97`		`- scala_version: 2.12.16`
	`97`	`+ scala_version: 2.12.17`
`98`	`98`	`- scala_job:`
`99`	`99`	`name: 2.13.10`
`100`	`100`	`java_version: jdk8`
`@@ -106,7 +106,7 @@ workflows:`
`106`	`106`	`- scala_job:`
`107`	`107`	`name: jdk11_2.12`
`108`	`108`	`java_version: jdk11`
`109`		`- scala_version: 2.12.16`
	`109`	`+ scala_version: 2.12.17`
`110`	`110`	`- scala_job:`
`111`	`111`	`name: jdk11_2.13`
`112`	`112`	`java_version: jdk11`
`@@ -118,7 +118,7 @@ workflows:`
`118`	`118`	`- scala_job:`
`119`	`119`	`name: jdk17_2.12`
`120`	`120`	`java_version: jdk17`
`121`		`- scala_version: 2.12.16`
	`121`	`+ scala_version: 2.12.17`
`122`	`122`	`- scala_job:`
`123`	`123`	`name: jdk17_2.13`
`124`	`124`	`java_version: jdk17`
`@@ -129,7 +129,7 @@ workflows:`
`129`	`129`	`scala_version: 3.1.3`
`130`	`130`	`- scalajs_job:`
`131`	`131`	`name: sjs1.0_2.12`
`132`		`- scala_version: 2.12.16`
	`132`	`+ scala_version: 2.12.17`
`133`	`133`	`- scalajs_job:`
`134`	`134`	`name: sjs1.0_2.13`
`135`	`135`	`scala_version: 2.13.10`
`@@ -138,7 +138,7 @@ workflows:`
`138`	`138`	`scala_version: 3.1.3`
`139`	`139`	`- scalanative_job:`
`140`	`140`	`name: native0.4_2.12`
`141`		`- scala_version: 2.12.16`
	`141`	`+ scala_version: 2.12.17`
`142`	`142`	`- scalanative_job:`
`143`	`143`	`name: native0.4_2.13`
`144`	`144`	`scala_version: 2.13.10`

`‎build.sbt‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)`
`35`	`35`	`.settings(`
`36`	`36`	`name := "scala-xml",`
`37`	`37`	`scalaModuleAutomaticModuleName := Some("scala.xml"),`
`38`		`- crossScalaVersions := Seq("2.13.10", "2.12.16", "3.1.3"),`
`39`		`- scalaVersion := "2.12.16",`
	`38`	`+ crossScalaVersions := Seq("2.13.10", "2.12.17", "3.1.3"),`
	`39`	`+ scalaVersion := "2.12.17",`
`40`	`40`
`41`	`41`	`scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {`
`42`	`42`	`case Some((3, _)) =>`

`‎project/build.properties‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=1.7.1`
	`1`	`+sbt.version=1.7.2`

`‎project/plugins.sbt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.0.1")`
`2`	`2`	`addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")`
`3`	`3`	`addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")`
`4`		`-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")`
	`4`	`+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")`
`5`	`5`	`addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7")`
`6`	`6`	`addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f579a33

File tree

4 files changed

4 files changed

`‎.circleci/config.yml‎`

`‎build.sbt‎`

`‎project/build.properties‎`

`‎project/plugins.sbt‎`

0 commit comments