Move starr to 2.13.0-M4, re-enable osgi tests

Author: lrytz

build.sbt

@@ -873,10 +873,8 @@ lazy val root: Project = (project in file("."))
         (testOnly in IntegrationTest in testP).toTask(" -- res scalap specialized").result map (_ -> "partest res scalap specialized"),
         (testOnly in IntegrationTest in testP).toTask(" -- instrumented presentation").result map (_ -> "partest instrumented presentation"),
         (testOnly in IntegrationTest in testP).toTask(" -- --srcpath scaladoc").result map (_ -> "partest --srcpath scaladoc"),
-        // TODO-newColl: re-enable osgi tests. they fail because scala-xml `1.1.0-newCollectionsBootstrap` is not a valid version.
-        // We cannot release 1.1.1 currently, because there's no Scala.js for 2.13.0-M4-pre-20d3c21.
-        // (Keys.test in Test in osgiTestFelix).result map (_ -> "osgiTestFelix/test"),
-        // (Keys.test in Test in osgiTestEclipse).result map (_ -> "osgiTestEclipse/test"),
+        (Keys.test in Test in osgiTestFelix).result map (_ -> "osgiTestFelix/test"),
+        (Keys.test in Test in osgiTestEclipse).result map (_ -> "osgiTestEclipse/test"),
         (mimaReportBinaryIssues in library).result map (_ -> "library/mimaReportBinaryIssues"),
         (mimaReportBinaryIssues in reflect).result map (_ -> "reflect/mimaReportBinaryIssues"),
         (compile in Compile in bench).map(_ => ()).result map (_ -> "bench/compile"),

versions.properties

@@ -1,5 +1,5 @@
 # Scala version used for bootstrapping (see README.md)
-starr.version=2.13.0-M4-pre-20d3c21
+starr.version=2.13.0-M4
 
 # These are the versions of the modules that go with this release.
 # Artifact dependencies: