Skip to content

Commit 8523b4c

Browse files
bvennersbvenners
committed
Merge branch 'cheeseng-feature-scala-js-1.0.0' into 3.1.x
2 parents b866487 + 138b8be commit 8523b4c

File tree

4 files changed

+34
-25
lines changed

4 files changed

+34
-25
lines changed

‎project/JsBuild.scala‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
1414

1515
trait JsBuild { this: BuildCommons =>
1616

17-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
17+
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
18+
val sjsPrefix = if (scalaJSVersion.startsWith("1.")) "_sjs1_" else "_sjs0.6_"
1819

1920
lazy val deleteJsDependenciesTask = taskKey[Unit]("Delete JS_DEPENDENCIES")
2021

@@ -80,7 +81,7 @@ trait JsBuild { this: BuildCommons =>
8081
// include the macro sources in the main source jar
8182
mappings in (Compile, packageSrc) ++= mappings.in(scalacticMacroJS, Compile, packageSrc).value,
8283
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
83-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
84+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
8485
).settings(osgiSettings: _*).settings(
8586
OsgiKeys.exportPackage := Seq(
8687
"org.scalactic",
@@ -148,7 +149,7 @@ trait JsBuild { this: BuildCommons =>
148149
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
149150
scalatestJSDocTaskSetting,
150151
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
151-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
152+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
152153
).settings(osgiSettings: _*).settings(
153154
OsgiKeys.exportPackage := Seq(
154155
"org.scalatest",
@@ -224,7 +225,7 @@ trait JsBuild { this: BuildCommons =>
224225
}.taskValue
225226
},
226227
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
227-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
228+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
228229
).settings(osgiSettings: _*).settings(
229230
OsgiKeys.exportPackage := Seq(
230231
"org.scalatest",
@@ -450,7 +451,7 @@ trait JsBuild { this: BuildCommons =>
450451
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
451452
scalatestJSDocTaskSetting,
452453
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
453-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
454+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
454455
).settings(osgiSettings: _*).settings(
455456
OsgiKeys.exportPackage := Seq(
456457
"org.scalatest",
@@ -499,7 +500,7 @@ trait JsBuild { this: BuildCommons =>
499500
},
500501
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
501502
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
502-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
503+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
503504
).settings(osgiSettings: _*).settings(
504505
OsgiKeys.exportPackage := Seq(
505506
"org.scalatest.featurespec"
@@ -531,7 +532,7 @@ trait JsBuild { this: BuildCommons =>
531532
},
532533
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
533534
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
534-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
535+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
535536
).settings(osgiSettings: _*).settings(
536537
OsgiKeys.exportPackage := Seq(
537538
"org.scalatest.flatspec"
@@ -563,7 +564,7 @@ trait JsBuild { this: BuildCommons =>
563564
},
564565
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
565566
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
566-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
567+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
567568
).settings(osgiSettings: _*).settings(
568569
OsgiKeys.exportPackage := Seq(
569570
"org.scalatest.freespec"
@@ -595,7 +596,7 @@ trait JsBuild { this: BuildCommons =>
595596
},
596597
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
597598
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
598-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
599+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
599600
).settings(osgiSettings: _*).settings(
600601
OsgiKeys.exportPackage := Seq(
601602
"org.scalatest.funsuite"
@@ -627,7 +628,7 @@ trait JsBuild { this: BuildCommons =>
627628
},
628629
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
629630
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
630-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
631+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
631632
).settings(osgiSettings: _*).settings(
632633
OsgiKeys.exportPackage := Seq(
633634
"org.scalatest.funspec"
@@ -659,7 +660,7 @@ trait JsBuild { this: BuildCommons =>
659660
},
660661
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
661662
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
662-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
663+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
663664
).settings(osgiSettings: _*).settings(
664665
OsgiKeys.exportPackage := Seq(
665666
"org.scalatest.propspec"
@@ -691,7 +692,7 @@ trait JsBuild { this: BuildCommons =>
691692
},
692693
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
693694
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
694-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
695+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
695696
).settings(osgiSettings: _*).settings(
696697
OsgiKeys.exportPackage := Seq(
697698
"org.scalatest.wordspec"
@@ -723,7 +724,7 @@ trait JsBuild { this: BuildCommons =>
723724
},
724725
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
725726
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
726-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
727+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
727728
).settings(osgiSettings: _*).settings(
728729
OsgiKeys.exportPackage := Seq(
729730
"org.scalatest.diagrams"
@@ -756,7 +757,7 @@ trait JsBuild { this: BuildCommons =>
756757
},
757758
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
758759
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
759-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
760+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
760761
).settings(osgiSettings: _*).settings(
761762
OsgiKeys.exportPackage := Seq(
762763
"org.scalatest.matchers",
@@ -789,7 +790,7 @@ trait JsBuild { this: BuildCommons =>
789790
},
790791
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
791792
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
792-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
793+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
793794
).settings(osgiSettings: _*).settings(
794795
OsgiKeys.exportPackage := Seq(
795796
"org.scalatest.matchers.should"
@@ -821,7 +822,7 @@ trait JsBuild { this: BuildCommons =>
821822
},
822823
scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification")),
823824
mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
824-
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
825+
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
825826
).settings(osgiSettings: _*).settings(
826827
OsgiKeys.exportPackage := Seq(
827828
"org.scalatest.matchers.must"

‎project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
44

55
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
66

7-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
7+
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
88

99
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1010

‎publish.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
sbt clean
22
sbt "project scalactic" clean +publishSigned
3-
export SCALAJS_VERSION=0.6.31
3+
export SCALAJS_VERSION=0.6.32
44
sbt "project scalacticJS" clean +publishSigned
5-
export SCALAJS_VERSION=1.0.0-RC2
5+
export SCALAJS_VERSION=1.0.0
66
sbt ++2.11.12 "project scalacticJS" clean publishSigned
77
sbt ++2.12.10 "project scalacticJS" clean publishSigned
88
sbt ++2.13.1 "project scalacticJS" clean publishSigned
@@ -13,9 +13,9 @@ sbt "project scalactic" sonatypeBundleUpload
1313
sbt clean
1414
sbt scalatestCompatible/clean scalatestCompatible/publishSigned
1515
sbt "project scalatest" clean +publishSigned
16-
export SCALAJS_VERSION=0.6.31
16+
export SCALAJS_VERSION=0.6.32
1717
sbt "project scalatestJS" clean +publishSigned
18-
export SCALAJS_VERSION=1.0.0-RC2
18+
export SCALAJS_VERSION=1.0.0
1919
sbt ++2.11.12 "project scalatestJS" clean publishSigned
2020
sbt ++2.12.10 "project scalatestJS" clean publishSigned
2121
sbt ++2.13.1 "project scalatestJS" clean publishSigned
@@ -24,9 +24,9 @@ sbt "project scalatestDotty" clean publishSigned
2424

2525
sbt clean
2626
sbt "project scalatestApp" clean +publishSigned
27-
export SCALAJS_VERSION=0.6.31
27+
export SCALAJS_VERSION=0.6.32
2828
sbt "project scalatestAppJS" clean +publishSigned
29-
export SCALAJS_VERSION=1.0.0-RC2
29+
export SCALAJS_VERSION=1.0.0
3030
sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
3131
sbt ++2.12.10 "project scalatestAppJS" clean publishSigned
3232
sbt ++2.13.1 "project scalatestAppJS" clean publishSigned

‎scalactic.js/src/main/scala/org/scalactic/source/ObjectMeta.scala‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,20 @@ object ObjectMeta {
5757
replaceAllLiterally("$sp", "").
5858
replaceAllLiterally("$f", "")
5959

60-
Some((filterDollarNumberAtTheEnd(decodedKey), value))
60+
val decodedKey10 = {
61+
val idx = decodedKey.indexOf("__f_")
62+
if (idx >= 0)
63+
decodedKey.drop(idx + 4)
64+
else
65+
decodedKey
66+
}
67+
68+
Some((filterDollarNumberAtTheEnd(decodedKey10), value))
6169
}.flatten.toMap
6270

6371
new ObjectMeta {
6472

65-
lazy val fieldNames = dict.keys.toVector.filter(_ != "$$outer")
73+
lazy val fieldNames = dict.keys.toVector.filter(k => k != "$$outer" && k != "$outer")
6674

6775
def value(name: String): Any = {
6876
dict.get(name) match {

0 commit comments

Comments
 (0)