File tree Expand file tree Collapse file tree 5 files changed +32
-16
lines changed Expand file tree Collapse file tree 5 files changed +32
-16
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ commands:
2020 parameters :
2121 scala_version :
2222 type : string
23- default : 2.12.12
23+ default : 2.12.13
2424 sbt_tasks :
2525 type : string
2626 default : update compile test:compile test doc package osgiBundle
4444 parameters :
4545 scala_version :
4646 description : " Scala version"
47- default : 2.12.12
47+ default : 2.12.13
4848 type : string
4949 java_version :
5050 description : " Java version"
6161 parameters :
6262 scala_version :
6363 description : " Scala version"
64- default : 2.12.12
64+ default : 2.12.13
6565 type : string
6666 scalajs_version :
6767 description : " ScalaJS version"
@@ -81,9 +81,9 @@ workflows:
8181 build :
8282 jobs :
8383 - scala_job :
84- name : 2.12.12
84+ name : 2.12.13
8585 java_version : jdk8
86- scala_version : 2.12.12
86+ scala_version : 2.12.13
8787 - scala_job :
8888 name : 2.13.4
8989 java_version : jdk8
@@ -99,7 +99,7 @@ workflows:
9999 - scala_job :
100100 name : jdk11_2.12
101101 java_version : jdk11
102- scala_version : 2.12.12
102+ scala_version : 2.12.13
103103 - scala_job :
104104 name : jdk11_2.13
105105 java_version : jdk11
@@ -111,7 +111,7 @@ workflows:
111111 - scala_job :
112112 name : jdk15_2.12
113113 java_version : jdk15
114- scala_version : 2.12.12
114+ scala_version : 2.12.13
115115 - scala_job :
116116 name : jdk15_2.13
117117 java_version : jdk15
@@ -123,7 +123,7 @@ workflows:
123123 - scala_job :
124124 name : jdk16_2.12
125125 java_version : jdk16
126- scala_version : 2.12.12
126+ scala_version : 2.12.13
127127 - scala_job :
128128 name : jdk16_2.13
129129 java_version : jdk16
@@ -134,7 +134,7 @@ workflows:
134134 scala_version : 3.0.0-M3
135135 - scalajs_job :
136136 name : sjs1.0_2.12
137- scala_version : 2.12.12
137+ scala_version : 2.12.13
138138 scalajs_version : 1.4.0
139139 - scalajs_job :
140140 name : sjs1.0_2.13
Original file line number Diff line number Diff line change @@ -7,14 +7,15 @@ language: scala
77scala :
88 - 3.0.0-M3
99 - 3.0.0-M2
10- - 2.12.12
10+ - 2.12.13
1111 - 2.13.4
1212
1313env :
14- - SCALAJS_VERSION= ADOPTOPENJDK=8
15- - SCALAJS_VERSION=1.4.0 ADOPTOPENJDK=8
16- - SCALAJS_VERSION= ADOPTOPENJDK=11
17- - SCALAJS_VERSION= ADOPTOPENJDK=15
14+ - SCALAJS_VERSION= ADOPTOPENJDK=8
15+ - SCALAJS_VERSION=1.4.0 ADOPTOPENJDK=8
16+ - SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
17+ - SCALAJS_VERSION= ADOPTOPENJDK=11
18+ - SCALAJS_VERSION= ADOPTOPENJDK=15
1819
1920install :
2021 - git fetch --tags # get all tags for sbt-dynver
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ lazy val configSettings: Seq[Setting[_]] = Seq(
1818 }
1919)
2020
21- lazy val xml = crossProject(JSPlatform , JVMPlatform )
21+ lazy val xml = crossProject(JSPlatform , JVMPlatform , NativePlatform )
2222 .withoutSuffixFor(JVMPlatform )
2323 .crossType(CrossType .Full )
2424 .in(file(" ." ))
@@ -163,3 +163,11 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
163163 Test / fork := false
164164 )
165165 .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin ))
166+ .nativeSettings(
167+ scalaModuleMimaPreviousVersion := None , // No such release yet
168+ // Scala Native cannot run forked tests
169+ Test / fork := false ,
170+ libraryDependencies += " org.scala-native" %%% " junit-runtime" % nativeVersion % Test ,
171+ addCompilerPlugin(" org.scala-native" % " junit-plugin" % nativeVersion cross CrossVersion .full),
172+ Test / testOptions += Tests .Argument (TestFrameworks .JUnit , " -a" , " -s" , " -v" )
173+ )
Original file line number Diff line number Diff line change @@ -25,8 +25,10 @@ isReleaseJob() {
2525 fi
2626}
2727
28- if [[ " $SCALAJS_VERSION " == " " ]]; then
28+ if [[ " $SCALAJS_VERSION " == " " ]] && [[ " $SCALANATIVE_VERSION " == " " ]] ; then
2929 projectPrefix=" xml/"
30+ elif [[ " $SCALAJS_VERSION " == " " ]]; then
31+ projectPrefix=" xmlNative/"
3032else
3133 projectPrefix=" xmlJS/"
3234fi
Original file line number Diff line number Diff line change 11val scalaJSVersion =
22 Option (System .getenv(" SCALAJS_VERSION" )).filter(_.nonEmpty).getOrElse(" 1.4.0" )
33
4+ val scalaNativeVersion =
5+ Option (System .getenv(" SCALANATIVE_VERSION" )).filter(_.nonEmpty).getOrElse(" 0.4.0" )
6+
47addSbtPlugin(" org.scala-lang.modules" % " sbt-scala-module" % " 2.2.3" )
58addSbtPlugin(" org.portable-scala" % " sbt-scalajs-crossproject" % " 1.0.0" )
9+ addSbtPlugin(" org.portable-scala" % " sbt-scala-native-crossproject" % " 1.0.0" )
610addSbtPlugin(" org.scala-js" % " sbt-scalajs" % scalaJSVersion)
11+ addSbtPlugin(" org.scala-native" % " sbt-scala-native" % scalaNativeVersion)
712addSbtPlugin(" ch.epfl.lamp" % " sbt-dotty" % " 0.5.1" )
You can’t perform that action at this time.
0 commit comments